diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-03-13 13:43:13 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-03-13 13:43:13 -0700 |
| commit | f92021cc090fbc4bffd68cf0536f7a801b769c79 (patch) | |
| tree | b4e0de5434bf71aca1422bb9aa59a7d83c08bb1d /indra/newview | |
| parent | d37b3ca62ea5d1f2d3cd57909d77c42227024c0f (diff) | |
| parent | 3468d2d93b7ea3ec4a86445a6187aa6738d8fc16 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterimnearbychat.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp index cfee5001a6..eb1a1f54ed 100644 --- a/indra/newview/llfloaterimnearbychat.cpp +++ b/indra/newview/llfloaterimnearbychat.cpp @@ -274,7 +274,7 @@ void LLFloaterIMNearbyChat::onTearOffClicked() LLFloaterIMSessionTab::onTearOffClicked(); // see CHUI-170: Save torn-off state of the nearby chat between sessions - BOOL in_the_multifloater = !isTornOff(); + BOOL in_the_multifloater = (BOOL)getHost(); gSavedSettings.setBOOL("NearbyChatIsNotTornOff", in_the_multifloater); } @@ -297,8 +297,10 @@ void LLFloaterIMNearbyChat::onClose(bool app_quitting) void LLFloaterIMNearbyChat::onClickCloseBtn() { if (!isTornOff()) + { return; - onTearOffClicked(); + } + LLFloaterIMSessionTab::onTearOffClicked(); LLFloaterIMContainer *im_box = LLFloaterIMContainer::findInstance(); if (im_box) diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp index 5fc7f46ca3..9fd22b1537 100644 --- a/indra/newview/llfloaterimsessiontab.cpp +++ b/indra/newview/llfloaterimsessiontab.cpp @@ -272,7 +272,7 @@ BOOL LLFloaterIMSessionTab::postBuild() mRefreshTimer->start(); initBtns(); - if (mIsParticipantListExpanded != gSavedSettings.getBOOL("IMShowControlPanel")) + if (mIsParticipantListExpanded != (bool)gSavedSettings.getBOOL("IMShowControlPanel")) { LLFloaterIMSessionTab::onSlide(this); } |