From f8d1644a4132356c2a0220110b9d9bc981f73b16 Mon Sep 17 00:00:00 2001 From: Yuri Chebotarev Date: Thu, 5 Nov 2009 13:17:12 +0200 Subject: fix for major bug ext-2209 Nearby Chat log is broken --HG-- branch : product-engine --- indra/llui/llfloaterreg.cpp | 2 +- indra/newview/llnearbychat.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index f8e07913fb..03925f922c 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -367,7 +367,7 @@ std::string LLFloaterReg::declareVisibilityControl(const std::string& name) std::string LLFloaterReg::declareDockStateControl(const std::string& name) { std::string controlname = getDockStateControlName(name); - LLUI::sSettingGroups["floater"]->declareBOOL(controlname, FALSE, + LLUI::sSettingGroups["floater"]->declareBOOL(controlname, TRUE, llformat("Window Docking state for %s", name.c_str()), TRUE); return controlname; diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 81d033d7f9..c68d3fe023 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -107,12 +107,14 @@ BOOL LLNearbyChat::postBuild() void LLNearbyChat::applySavedVariables() { - if (mRectControl.size() > 1) { const LLRect& rect = LLUI::sSettingGroups["floater"]->getRect(mRectControl); - reshape(rect.getWidth(), rect.getHeight()); - setRect(rect); + if(!rect.isEmpty() && rect.isValid()) + { + reshape(rect.getWidth(), rect.getHeight()); + setRect(rect); + } } -- cgit v1.2.3