diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-07-04 16:45:02 +0300 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-07-04 16:45:02 +0300 |
| commit | 73ad740443e615467f7e14fe4fb3f04d8abe2f9c (patch) | |
| tree | d3ddf32376a98163e88bf60a689501646b79ebab /indra/newview/llimfloatercontainer.cpp | |
| parent | c76c73770bf1a4095100cdb79021826ebebbd2f0 (diff) | |
CHUI-170 FIXED Save Torn off state of Nearby Chat between sessions
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 30a77bef98..546eccbd04 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -302,9 +302,8 @@ void LLIMFloaterContainer::setVisible(BOOL visible) if (visible) { // Make sure we have the Nearby Chat present when showing the conversation container - LLUUID nearbychat_uuid = LLUUID::null; // Hacky but true: the session id for nearby chat is always null - LLFloater* floaterp = findConversationItem(nearbychat_uuid); - if (floaterp == NULL) + LLFloater* nearby_chat = LLFloaterReg::findInstance("chat_bar"); + if (nearby_chat == NULL) { // If not found, force the creation of the nearby chat conversation panel // *TODO: find a way to move this to XML as a default panel or something like that |