summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-26 10:25:35 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-26 10:25:35 +0100
commita0467365140c504eb0f5ad053ac22a2698a2abd7 (patch)
treea152b229228a5923bfb293948d7dfca8f9a4bc8c /indra/newview/app_settings
parent1993732a6ca6a27f5e433e108b614eed5153cd1f (diff)
parentd0204a2b149462371ee20725067e43b018c485bb (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/app_settings')
-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 4ca23e14a1..a6dbe00759 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10994,5 +10994,16 @@
<integer>2048</integer>
</map>
<!-- End of back compatibility settings -->
+ <key>teleport_offer_invitation_max_length</key>
+ <map>
+ <key>Comment</key>
+ <string>Maximum length of teleport offer invitation line editor. 254 - max_location_url_length(76) = 178</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>178</integer>
+ </map>
</map>
</llsd>