diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-04-21 16:43:56 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-04-21 16:43:56 -0400 |
| commit | 5f6bcaf456469f07d23a5599a1fed59420fd6ae7 (patch) | |
| tree | aff6d5b13b69121919433f80103e0594b3525c9d /indra/newview/llfloaterimnearbychat.cpp | |
| parent | f62b5503285d828813d87779fa0658ee5f122ac5 (diff) | |
| parent | 7a6a2db289581e43c509ca7dfff7d9b72897a10e (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.cpp')
| -rw-r--r-- | indra/newview/llfloaterimnearbychat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp index 40ae22bb4e..d18f03d8e9 100644 --- a/indra/newview/llfloaterimnearbychat.cpp +++ b/indra/newview/llfloaterimnearbychat.cpp @@ -282,7 +282,7 @@ void LLFloaterIMNearbyChat::onTearOffClicked() LLFloaterIMSessionTab::onTearOffClicked(); // see CHUI-170: Save torn-off state of the nearby chat between sessions - BOOL in_the_multifloater = (BOOL)getHost(); + bool in_the_multifloater(getHost()); gSavedPerAccountSettings.setBOOL("NearbyChatIsNotTornOff", in_the_multifloater); } |