diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-22 11:52:02 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-22 11:52:02 -0400 |
commit | b9c7d383707fca68bcf8256285adc0bab4259ce5 (patch) | |
tree | 60c98bf056c8f85509f362998d15761960ae4aae /indra/newview/app_settings | |
parent | 0656620e2d6b4b9ca1fabf4f045df77256f31a60 (diff) | |
parent | 06c4819b097c6364c1e3bc7566a4e677a7bde4a2 (diff) |
merge changes for beta fixes
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 636f6e65fe..4e666952ce 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -652,17 +652,6 @@ <key>Value</key> <integer>1</integer> </map> - <key>AvatarPhysicsTest</key> - <map> - <key>Comment</key> - <string>Simulate continuous physics behavior on all nearby avatars.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>AvatarSex</key> <map> <key>Comment</key> |