diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-13 09:22:06 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-13 09:22:06 +0100 |
| commit | c8602b293517dfb4d5c6658ab235af9fe9932b7e (patch) | |
| tree | b5272175264fa52d235a78365205d817d363c320 /indra/newview/llpanelonlinestatus.cpp | |
| parent | ef685e520967f41549519b8df14c7d585f3b644b (diff) | |
| parent | f790036002a49176066ec346e4068dc05aa88357 (diff) | |
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llpanelonlinestatus.cpp')
| -rw-r--r-- | indra/newview/llpanelonlinestatus.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelonlinestatus.cpp b/indra/newview/llpanelonlinestatus.cpp index 6ba015b11c..b21fd7d385 100644 --- a/indra/newview/llpanelonlinestatus.cpp +++ b/indra/newview/llpanelonlinestatus.cpp @@ -34,6 +34,7 @@ #include "llnotifications.h" #include "llpanelonlinestatus.h" +#include "llviewercontrol.h" // for gSavedSettings LLPanelOnlineStatus::LLPanelOnlineStatus( const LLNotificationPtr& notification) : @@ -54,7 +55,7 @@ LLPanelOnlineStatus::LLPanelOnlineStatus( notification, notification->getResponseTemplate())); } - // 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); } |