summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-04-02 18:12:58 -0500
committerDave Parks <davep@lindenlab.com>2012-04-02 18:12:58 -0500
commit0cce43aefefa2546b83f373ed81f8dbc7a6241d2 (patch)
tree7c228bd77d7787b5865de61f9dbd754b9dcd83a7 /indra/newview/app_settings
parent6e184e33018a5395bfbb2c92812229d115944ab5 (diff)
parent9ccc2a0fced1a5b1e6bdef34eef07133f7754c72 (diff)
merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml22
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d18df2d9b2..8e2d69ea9b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13724,5 +13724,27 @@
<real>1.0</real>
</array>
</map>
+ <key>PathfindingDisablePermanentObjects</key>
+ <map>
+ <key>Comment</key>
+ <string>Disables the viewer from seeing the permanent object flag. Useful for testing server-side enforcement of permanent object rules.</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>PathfindingDisableCharacterObjects</key>
+ <map>
+ <key>Comment</key>
+ <string>Disables the viewer from seeing the character object flag. Useful for testing server-side enforcement of character object rules.</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
</map>
</llsd>