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