summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-21 14:19:25 -0400
committerOz Linden <oz@lindenlab.com>2012-06-21 14:19:25 -0400
commitf64a79d9d14fe52dc9ac599bc9e4faf8009254ce (patch)
treed14ff8f9cf8bd723b8d479446f47eeb4211e8326 /indra/newview/app_settings
parentee130adc60dea8530f82d90107198ebcbd63fded (diff)
parent4539e5c8e93badc83e71045ba87ef81bf8740cab (diff)
merge changes for DRTVWR-171
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f874df5cb4..2c5960ccd5 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>