diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-07-12 17:52:40 +0300 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-07-12 17:52:40 +0300 |
| commit | 34cb8b7402a7e4727dd28ddc90d8d142dbbed3b6 (patch) | |
| tree | c489fc215a77345352dbaea2294589af758e2fa5 /indra/newview/llpanelgenerictip.cpp | |
| parent | 38d763b34fe8411684c0f73627dc018ff9171c87 (diff) | |
| parent | 1cdf970d10198c0f50790226c78e16d2a809a3d3 (diff) | |
Automated merge with https://hg.productengine.com/secondlife/viewer-release/
--HG--
branch : product-engine
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); } |