diff options
| author | palange <palange@lindenlab.com> | 2009-11-05 17:54:51 -0800 |
|---|---|---|
| committer | palange <palange@lindenlab.com> | 2009-11-05 17:54:51 -0800 |
| commit | 4ead03acd094d8418f9fe0f883e776ce8b209722 (patch) | |
| tree | 1ae53248e9a643c9f27333aabc31ff0291e59b45 /indra/newview/llnearbychat.cpp | |
| parent | ec32310c8602bf4dc69ed27e8c177cbd32c24411 (diff) | |
| parent | 81192236ac44ea500ea6ec6f8de32be11e9165ca (diff) | |
merge to viewer-2-0
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); + } } |