summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-26 10:57:51 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-26 10:57:51 +0100
commit438f0e372ee8a1d41d535314e4061f20f6c66c88 (patch)
treef329e9c86829b06ded1742db7edf271aacb7d3c1 /indra/newview/app_settings
parent1a987e8d32a733cace7ffdb239729380cd53f87c (diff)
parenta0467365140c504eb0f5ad053ac22a2698a2abd7 (diff)
merge from 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 2610fcd248..8abb0f7106 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11084,5 +11084,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>