diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-08-04 15:44:45 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-08-04 15:44:45 -0700 |
| commit | 6f256e2d57d6814fdb97809405989c54ab148c6b (patch) | |
| tree | 0584e6231bf80e9919e7bf30caceece94b25deb4 /indra/newview/llpanelgenerictip.cpp | |
| parent | a97bcb7c7fd705818b7f36af2c4a915e85ff5604 (diff) | |
| parent | eefe3388da83ce3e368af28ba466c27644f156c8 (diff) | |
Merge with dessie/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); } |