diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-02-05 20:20:42 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-02-05 20:20:42 +0000 |
| commit | d1582a5105f01181535fb859c530e45c2efca071 (patch) | |
| tree | f8c6939e2c67d64d7be0e2488af296b42f13800d /indra/newview/llpreviewnotecard.cpp | |
| parent | 57be416ab7c9d93196231fb55de8ba563f3b29eb (diff) | |
merge -r 57111:57464 maintenance.
Diffstat (limited to 'indra/newview/llpreviewnotecard.cpp')
| -rw-r--r-- | indra/newview/llpreviewnotecard.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp index a37ed692b1..6b8cc626ee 100644 --- a/indra/newview/llpreviewnotecard.cpp +++ b/indra/newview/llpreviewnotecard.cpp @@ -91,8 +91,12 @@ LLPreviewNotecard::LLPreviewNotecard(const std::string& name, } } - reshape(curRect.getWidth(), curRect.getHeight(), TRUE); - setRect(curRect); + // only assert shape if not hosted in a multifloater + if (!getHost()) + { + reshape(curRect.getWidth(), curRect.getHeight(), TRUE); + setRect(curRect); + } childSetVisible("lock", FALSE); |