summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-07 06:43:13 -0800
committerRichard Linden <none@none>2011-03-07 06:43:13 -0800
commitf28d3a13d34937285f9d920d306896162ae91e4b (patch)
treec1259d7b1d762fde12b480aaa93074974dc09bb0 /indra/newview/app_settings/settings.xml
parent61e7c4166ffb6e16c42282d68a29365da5c62c5f (diff)
parent25ad57c4b6db3793a0bb6fc1901ea6b0e969c17f (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social/
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 a2459890a1..3dedf0ddd7 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12476,5 +12476,16 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>SearchFromAddressBar</key>
+ <map>
+ <key>Comment</key>
+ <string>Can enter search queries into navigation address bar</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
</map>
</llsd>