diff options
| author | Richard Linden <none@none> | 2013-11-19 17:40:44 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-11-19 17:40:44 -0800 |
| commit | 391ac367d6922f30bf3a186bc15e1fc38366eecf (patch) | |
| tree | ca318051118f3e264ef424167c7a377445500f06 /indra/newview/llfloaterimnearbychat.cpp | |
| parent | a868b7ed41d8b7d04ae47490564cdc35bcfbac1a (diff) | |
SH-4634 FIX Interesting: Viewer crashes when receiving teleport offer
renamed fast timers to have unique names, changes instance tracker to never allow duplicates
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.cpp')
| -rwxr-xr-x | indra/newview/llfloaterimnearbychat.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp index b5d179b6de..7a989806a1 100755 --- a/indra/newview/llfloaterimnearbychat.cpp +++ b/indra/newview/llfloaterimnearbychat.cpp @@ -89,7 +89,7 @@ static LLChatTypeTrigger sChatTypeTriggers[] = { LLFloaterIMNearbyChat::LLFloaterIMNearbyChat(const LLSD& llsd) -: LLFloaterIMSessionTab(llsd), +: LLFloaterIMSessionTab(LLSD(LLUUID::null)), //mOutputMonitor(NULL), mSpeakerMgr(NULL), mExpandedHeight(COLLAPSED_HEIGHT + EXPANDED_HEIGHT) @@ -97,7 +97,6 @@ LLFloaterIMNearbyChat::LLFloaterIMNearbyChat(const LLSD& llsd) mIsP2PChat = false; mIsNearbyChat = true; mSpeakerMgr = LLLocalSpeakerMgr::getInstance(); - mSessionID = LLUUID(); } //static |