diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:08:23 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:08:23 -0500 |
| commit | 375d91019eefa0f2bc4f4685fb0f34dac987b189 (patch) | |
| tree | c4bbed389b33de9dc8fbc746bccccb6545307ad6 /indra/newview/llimview.cpp | |
| parent | 732b1f748eb1844eb97ab2293ebc3b1bebb0c9e7 (diff) | |
| parent | 20e192029ceaf7e9b6d097d6e65089d9011a4c0b (diff) | |
merge fix for STORM-679
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 2922a4d654..f5f59d5973 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -573,7 +573,12 @@ void LLIMModel::LLIMSession::buildHistoryFileName() //ad-hoc requires sophisticated chat history saving schemes if (isAdHoc()) { - //in case of outgoing ad-hoc sessions + /* in case of outgoing ad-hoc sessions we need to make specilized names + * if this naming system is ever changed then the filtering definitions in + * lllogchat.cpp need to be change acordingly so that the filtering for the + * date stamp code introduced in STORM-102 will work properly and not add + * a date stamp to the Ad-hoc conferences. + */ if (mInitialTargetIDs.size()) { std::set<LLUUID> sorted_uuids(mInitialTargetIDs.begin(), mInitialTargetIDs.end()); |
