diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-05 13:31:38 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-05 13:31:38 -0800 |
| commit | b286744a368d2a492bd9a3446fb8d072bd9ee8cd (patch) | |
| tree | ec00b869367187831e097b0a406e193cb2e0832a /indra/newview/llnearbychat.cpp | |
| parent | 6ce9f3b047084a9b947f66d041645238feb4b09b (diff) | |
| parent | e26dacb374ec0fd87679aa730cf937a44bab3628 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index 81d033d7f9..974291a54e 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -61,7 +61,7 @@ static const S32 RESIZE_BAR_THICKNESS = 3; LLNearbyChat::LLNearbyChat(const LLSD& key) - : LLDockableFloater(NULL, key) + : LLDockableFloater(NULL, false, key) ,mChatHistory(NULL) { @@ -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); + } } |