summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelonlinestatus.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-07-27 14:22:14 -0700
committerRichard Linden <none@none>2010-07-27 14:22:14 -0700
commit15247f086989a43881d79c1ee5416bb00721eb68 (patch)
treee77d629f6d03ed7ca471e77ccefcd9437be82c49 /indra/newview/llpanelonlinestatus.cpp
parent5d85dad85f07ea23b3a2892276d8ac591a966864 (diff)
Backed out changeset: 58571b4e704b
Diffstat (limited to 'indra/newview/llpanelonlinestatus.cpp')
-rw-r--r--indra/newview/llpanelonlinestatus.cpp5
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);
}