summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimnearbychat.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-10-11 14:35:49 -0400
committerNat Goodspeed <nat@lindenlab.com>2017-10-11 14:35:49 -0400
commit0c7bc67814dd4fa347401c24ba0e1be78e4b838f (patch)
tree450fc1ce0aff2f2880c32b3ca85161ca0ceff8a6 /indra/newview/llfloaterimnearbychat.cpp
parentb6d22de58850fc9a5b34eeb5b7930e5845bfc42d (diff)
parent25be14381e29481413c94edf5436c0af715a1578 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.cpp')
-rw-r--r--indra/newview/llfloaterimnearbychat.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index b2568abb83..f9efd13608 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -292,7 +292,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);
}