summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authordmitrykproductengine <none@none>2013-09-04 13:09:35 +0300
committerdmitrykproductengine <none@none>2013-09-04 13:09:35 +0300
commitcedc571e4b4f887af352e2561e5c4d31ea6982f6 (patch)
tree27ebe58590552a3d0b9bc84d91a754e3ea17d8db /indra/newview
parent4bd87bb45f1c6aa2251c01311befa0975d596c3f (diff)
MAINT-3095 FIXED Viewer crashes after opening Nearby chat history, if it is empty
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llfloaterconversationpreview.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp
index b570de14aa..7cb313af33 100755
--- a/indra/newview/llfloaterconversationpreview.cpp
+++ b/indra/newview/llfloaterconversationpreview.cpp
@@ -126,7 +126,10 @@ void LLFloaterConversationPreview::draw()
void LLFloaterConversationPreview::onOpen(const LLSD& key)
{
- showHistory();
+ if(mChatHistoryLoaded)
+ {
+ showHistory();
+ }
}
void LLFloaterConversationPreview::showHistory()