diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-03-15 17:57:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-03-15 17:57:48 -0700 |
| commit | e8b22d3299e5e02f3349315fcf9e0166632e06c4 (patch) | |
| tree | f0ae929e3bd76de83d41d7b286dfed15947e821d /indra/newview/llfloaterimnearbychat.cpp | |
| parent | 242c39f24bc38ee306f1a9b4a173fd095fdab49d (diff) | |
| parent | 780fe4e37fe5df4120ef4de09e6fc69f6184e4d3 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.cpp')
| -rw-r--r-- | indra/newview/llfloaterimnearbychat.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp index eb1a1f54ed..a593fd4732 100644 --- a/indra/newview/llfloaterimnearbychat.cpp +++ b/indra/newview/llfloaterimnearbychat.cpp @@ -275,7 +275,7 @@ void LLFloaterIMNearbyChat::onTearOffClicked() // see CHUI-170: Save torn-off state of the nearby chat between sessions BOOL in_the_multifloater = (BOOL)getHost(); - gSavedSettings.setBOOL("NearbyChatIsNotTornOff", in_the_multifloater); + gSavedPerAccountSettings.setBOOL("NearbyChatIsNotTornOff", in_the_multifloater); } @@ -290,6 +290,7 @@ void LLFloaterIMNearbyChat::onOpen(const LLSD& key) void LLFloaterIMNearbyChat::onClose(bool app_quitting) { // Override LLFloaterIMSessionTab::onClose() so that Nearby Chat is not removed from the conversation floater + LLFloaterIMSessionTab::restoreFloater(); onClickCloseBtn(); } @@ -336,7 +337,7 @@ bool LLFloaterIMNearbyChat::isChatVisible() const if (im_box != NULL) { isVisible = - isChatMultiTab() && gSavedSettings.getBOOL("NearbyChatIsNotTornOff")? + isChatMultiTab() && gSavedPerAccountSettings.getBOOL("NearbyChatIsNotTornOff")? im_box->getVisible() && !im_box->isMinimized() : getVisible() && !isMinimized(); } |