diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-18 21:11:56 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-06-18 21:11:56 +0300 |
| commit | bc5e0eda1b1b9c289734bebe6a533565aadfd3a2 (patch) | |
| tree | 372f21c43d094f959a2cb77e72ab0bd384fd5f1c /indra/newview/llnearbychat.cpp | |
| parent | 5207da8a63dcd4ab85dc3384c66340455a8aa7d1 (diff) | |
CHUI-119 fixed bug with creating multiply instances of the nearby chat;
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index fbaf451412..e4b891889c 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -130,6 +130,7 @@ LLNearbyChat::LLNearbyChat(const LLSD& key) mSpeakerMgr(NULL), mExpandedHeight(COLLAPSED_HEIGHT + EXPANDED_HEIGHT) { + mKey = LLSD(); mIsNearbyChat = true; mSpeakerMgr = LLLocalSpeakerMgr::getInstance(); } @@ -382,11 +383,6 @@ LLNearbyChat* LLNearbyChat::getInstance() return LLFloaterReg::getTypedInstance<LLNearbyChat>("chat_bar"); } -//static -//LLNearbyChat* LLNearbyChat::findInstance() -//{ -// return LLFloaterReg::findTypedInstance<LLNearbyChat>("chat_bar"); -//} void LLNearbyChat::showHistory() { |