diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 14:13:07 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-27 14:13:07 -0700 |
commit | 0e06dc8964d5ae31fccb2da522d05d822530d3c7 (patch) | |
tree | d15dfd4ab9dfc4724efe62373cbca6a24c97006b /indra/newview/llpanelonlinestatus.cpp | |
parent | 4c9760a073853ae81a78aa99119c059cdfaba664 (diff) | |
parent | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (diff) |
Merge from dessie/viewer-release
Diffstat (limited to 'indra/newview/llpanelonlinestatus.cpp')
-rw-r--r-- | indra/newview/llpanelonlinestatus.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpanelonlinestatus.cpp b/indra/newview/llpanelonlinestatus.cpp index b21fd7d385..6ba015b11c 100644 --- a/indra/newview/llpanelonlinestatus.cpp +++ b/indra/newview/llpanelonlinestatus.cpp @@ -34,7 +34,6 @@ #include "llnotifications.h" #include "llpanelonlinestatus.h" -#include "llviewercontrol.h" // for gSavedSettings LLPanelOnlineStatus::LLPanelOnlineStatus( const LLNotificationPtr& notification) : @@ -55,7 +54,7 @@ LLPanelOnlineStatus::LLPanelOnlineStatus( notification, notification->getResponseTemplate())); } - S32 max_line_count = gSavedSettings.getS32("TipToastMessageLineCount"); - snapToMessageHeight(getChild<LLTextBox> ("message"), max_line_count); + // set line max count to 3 in case of a very long name + snapToMessageHeight(getChild<LLTextBox> ("message"), 3); } |