summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2013-08-15 20:24:02 +0300
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2013-08-15 20:24:02 +0300
commit53eff025bc205e3127da4dc0c3df3cb406eb1153 (patch)
tree3cfd4991abfbc1def4a7c3ffab605bb94c0c8930
parent22140012c2b8f40081027bdcf2f5fbcd8a4527e9 (diff)
MAINT-2938 FIXED [CHUI] crash in LLFloaterConversationPreview::showHistory()
-rwxr-xr-xindra/newview/llfloaterconversationpreview.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp
index 1a3fa27593..b570de14aa 100755
--- a/indra/newview/llfloaterconversationpreview.cpp
+++ b/indra/newview/llfloaterconversationpreview.cpp
@@ -152,6 +152,11 @@ void LLFloaterConversationPreview::showHistory()
for (int msg_num = 0; (iter != mMessages.end() && msg_num < mPageSize); ++iter, ++msg_num)
{
+ if (iter->size() == 0)
+ {
+ continue;
+ }
+
LLSD msg = *iter;
LLUUID from_id = LLUUID::null;