diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-14 18:48:46 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-14 18:48:46 -0700 |
| commit | 0f86aa86f1780f70f125254d2108a33fcd9a7514 (patch) | |
| tree | 3e31eeee14b6bc03401ced16d6c12606ebe38136 /indra/newview/llnearbychat.cpp | |
| parent | 399ba09c08d8ccaf9b34daa8b743f837639b2f35 (diff) | |
| parent | 72f6bebe59f5f900af02a4d234a4091a3e034529 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index ddd271e23f..a803b35aa8 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -108,7 +108,7 @@ static LLChatTypeTrigger sChatTypeTriggers[] = { LLNearbyChat::LLNearbyChat(const LLSD& llsd) -: LLIMConversation(LLSD()), +: LLIMConversation(llsd.asUUID()), //mOutputMonitor(NULL), mSpeakerMgr(NULL), mExpandedHeight(COLLAPSED_HEIGHT + EXPANDED_HEIGHT) @@ -116,7 +116,7 @@ LLNearbyChat::LLNearbyChat(const LLSD& llsd) mIsP2PChat = false; mIsNearbyChat = true; setIsChrome(TRUE); - mKey = LLSD(); + mKey = LLSD(LLUUID()); mSpeakerMgr = LLLocalSpeakerMgr::getInstance(); mSessionID = LLUUID(); setName("nearby_chat"); |