diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-09 00:42:36 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-09 00:42:36 +0000 |
| commit | 81e0fb43caa27491fa18b17d6a05cafb0e20dfa6 (patch) | |
| tree | aea6b59f47a56255ab01c0b814650b943170847e /indra/newview/lltoastpanel.cpp | |
| parent | 4c89e7389383e2943334ad8ec185b8935cbe7db8 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1943 https://svn.aws.productengine.com/secondlife/pe/stable-2@1958 -> viewer-2.0.0-3
* Bugs: EXT-1148 EXT-1330 EXT-990 EXT-1259 EXT-1184 EXT-1327 EXT-1389 EXT-1276 EXT-1390 EXT-1396 EXT-1050 EXT-1094 EXT-1166 EXT-1137 EXT-1327 EXT-782 EXT-1137 EXT-1394 EXT-1326 EXT-917 EXT-1262
* New Dev: EXT-1292 EXT-1139
Diffstat (limited to 'indra/newview/lltoastpanel.cpp')
| -rw-r--r-- | indra/newview/lltoastpanel.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/lltoastpanel.cpp b/indra/newview/lltoastpanel.cpp index 68ad043129..7b477470aa 100644 --- a/indra/newview/lltoastpanel.cpp +++ b/indra/newview/lltoastpanel.cpp @@ -65,7 +65,6 @@ void LLToastPanel::snapToMessageHeight(LLTextBox* message, S32 maxLineCount) //This needed to calculate lines count according to specified text heightDelta = maxTextHeight - oldTextHeight; reshape( getRect().getWidth(), getRect().getHeight() + heightDelta); - message->setValue(message->getText()); //Knowing the height is set to max allowed, getTextPixelHeight returns needed text height //Perhaps we need to pass maxLineCount as parameter to getTextPixelHeight to avoid previous reshape. @@ -77,7 +76,6 @@ void LLToastPanel::snapToMessageHeight(LLTextBox* message, S32 maxLineCount) //reshape the panel with new height reshape( getRect().getWidth(), getRect().getHeight() + heightDelta); - message->setValue(message->getText()); } } |