diff options
author | Merov Linden <merov@lindenlab.com> | 2010-09-16 20:09:36 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-09-16 20:09:36 -0700 |
commit | 8ada6ed3cf562d33cc66f2a5d664b5e1f40e1f0c (patch) | |
tree | a6430d873ca02f5cee683c95a3a4747c16f8aace /indra/newview/llnearbychat.cpp | |
parent | 657f75b89de4cfd5ade82e3bc30e236cd2533017 (diff) | |
parent | 30c8979e157a4503509360f0c70d609eb97d6db9 (diff) |
Pull update from viewer-development
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
-rw-r--r-- | indra/newview/llnearbychat.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 5f71d7100b..28aea7ae3d 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -115,7 +115,7 @@ void LLNearbyChat::applySavedVariables() { if (mRectControl.size() > 1) { - const LLRect& rect = LLUI::sSettingGroups["floater"]->getRect(mRectControl); + const LLRect& rect = LLFloater::getControlGroup()->getRect(mRectControl); if(!rect.isEmpty() && rect.isValid()) { reshape(rect.getWidth(), rect.getHeight()); @@ -124,7 +124,7 @@ void LLNearbyChat::applySavedVariables() } - if(!LLUI::sSettingGroups["floater"]->controlExists(mDocStateControl)) + if(!LLFloater::getControlGroup()->controlExists(mDocStateControl)) { setDocked(true); } @@ -132,7 +132,7 @@ void LLNearbyChat::applySavedVariables() { if (mDocStateControl.size() > 1) { - bool dockState = LLUI::sSettingGroups["floater"]->getBOOL(mDocStateControl); + bool dockState = LLFloater::getControlGroup()->getBOOL(mDocStateControl); setDocked(dockState); } } |