diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 14:13:07 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 14:13:07 -0700 |
| commit | 0e06dc8964d5ae31fccb2da522d05d822530d3c7 (patch) | |
| tree | d15dfd4ab9dfc4724efe62373cbca6a24c97006b /indra/newview/llpanelgenerictip.cpp | |
| parent | 4c9760a073853ae81a78aa99119c059cdfaba664 (diff) | |
| parent | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (diff) | |
Merge from dessie/viewer-release
Diffstat (limited to 'indra/newview/llpanelgenerictip.cpp')
| -rw-r--r-- | indra/newview/llpanelgenerictip.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llpanelgenerictip.cpp b/indra/newview/llpanelgenerictip.cpp index 8ba2e6d01c..e0658554a4 100644 --- a/indra/newview/llpanelgenerictip.cpp +++ b/indra/newview/llpanelgenerictip.cpp @@ -35,7 +35,6 @@ #include "llpanelgenerictip.h" #include "llnotifications.h" -#include "llviewercontrol.h" // for gSavedSettings LLPanelGenericTip::LLPanelGenericTip( @@ -46,8 +45,7 @@ LLPanelGenericTip::LLPanelGenericTip( childSetValue("message", notification->getMessage()); - - S32 max_line_count = gSavedSettings.getS32("TipToastMessageLineCount"); - snapToMessageHeight(getChild<LLTextBox> ("message"), max_line_count); + // set line max count to 3 in case of a very long name + snapToMessageHeight(getChild<LLTextBox> ("message"), 3); } |