diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-07-13 17:16:36 -0700 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-07-13 17:16:36 -0700 |
| commit | 37fc4e42dd173d92abb31be83dbd04fa3b7b70fa (patch) | |
| tree | 0355075f8fb41548989517abc44a129f73c4a545 /indra/newview/llpanelgenerictip.cpp | |
| parent | a884f5c0c794777f33012a5ca318fd98bab32667 (diff) | |
| parent | 75c70884dab91490613ee0c9b866346a00bc9ad9 (diff) | |
Merge
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); } |