diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 17:50:32 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 17:50:32 -0800 |
| commit | 8c44fac93ffce1a41d84f1d6e98891a50ab1dbab (patch) | |
| tree | aca14bb3256b6dd4c1a7a342d36f2cc989159f41 /indra/newview/llnearbychat.cpp | |
| parent | 1712265901da8ba65f2a9ae3e903372fafacd268 (diff) | |
| parent | e654475529d924603a9b3bc8c4775c86d3cf7933 (diff) | |
merge from remote repo
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); + } } |