diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-05-25 18:45:27 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-05-25 18:45:27 -0700 |
| commit | b8bc62a514786121ac34857c0e052040e603d4e4 (patch) | |
| tree | bfcfda56d2331d92efe98294f68b04146b15770d /indra/newview/app_settings | |
| parent | b2b446aed7f7f32151bc152ba25d44253ebf864f (diff) | |
| parent | 403ed9656bf4c0c92004cce44d08972b9bd6ee43 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 05c05b9393..7771bcb1cf 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6356,17 +6356,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>NumpadControl</key> - <map> - <key>Comment</key> - <string>How numpad keys control your avatar. 0 = Like the normal arrow keys, 1 = Numpad moves avatar when numlock is off, 2 = Numpad moves avatar regardless of numlock (use this if you have no numlock)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>0</integer> - </map> <key>ObjectCacheEnabled</key> <map> <key>Comment</key> @@ -13516,5 +13505,16 @@ <key>Value</key> <integer>0</integer> </map> + <key>AdultCheckEnablePurchse</key> + <map> + <key>Comment</key> + <string>Hack to allow QA testing of purchasing land regardless of maturity rating.</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> </map> </llsd> |