summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-07-12 18:40:51 +0300
committerMike Antipov <mantipov@productengine.com>2010-07-12 18:40:51 +0300
commitee6c66316e9c9a6c019232b5c773d2063328cdd3 (patch)
tree61be2476631c8fb05b63d4cfe0df5c265b4fd1d8 /indra/newview/app_settings/settings.xml
parent8435d93653e4aa3e1c7602c5eaf34b4fed1c74f2 (diff)
parent34cb8b7402a7e4727dd28ddc90d8d142dbbed3b6 (diff)
Merge with another head in branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d51498f6d1..1c32f33290 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11857,5 +11857,16 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>TipToastMessageLineCount</key>
+ <map>
+ <key>Comment</key>
+ <string>Max line count of text message on tip toast.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>10</integer>
+ </map>
</map>
</llsd>