diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-05 14:10:00 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-05 14:10:00 +0200 |
| commit | ecb35d25ef68c21fd46220c60931103a44edebaa (patch) | |
| tree | 0be2ddd43b2850f4fa2b5989fec2422e0bf89832 /indra/newview/llnearbychat.cpp | |
| parent | ecd482d24b63d9658ac71d2bf4155e3ed9175bb9 (diff) | |
| parent | 9ec38e7ef6d51d6d817428075ec3d77a88a736ff (diff) | |
Merge
--HG--
branch : product-engine
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); + } } |