diff options
| author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-08-02 22:05:56 -0700 |
|---|---|---|
| committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-08-02 22:05:56 -0700 |
| commit | d10b9a7f37bec670342136eeea2c8c2604fdfeef (patch) | |
| tree | a6380a0442d103faed76f1a1c7e5eb03d0f3f6ae /indra/newview/llpanelgenerictip.cpp | |
| parent | a39b31abf87d93fb41212e952cc3ad1d8c91b5ef (diff) | |
| parent | b3b8ef25e192f5713c9d5ca47289499b17ff07d1 (diff) | |
Pulled from "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); } |