diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2013-07-30 22:15:49 -0600 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2013-07-30 22:15:49 -0600 |
commit | b832e6b62d96d30711f4eee2d299e257617692c8 (patch) | |
tree | 0d58682a8218fce416b08d7f997c80d1bc09b825 /indra/newview/app_settings | |
parent | efb2f156b601d7ca0e2513552dd8a21c2d0ed3ff (diff) | |
parent | 15fe4b3bbaf139960f934b629c236092182ed297 (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/app_settings')
-rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f0be4e394e..2a4e10fb6f 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6295,6 +6295,17 @@ <key>Value</key> <integer>130</integer> </map> + <key>NewObjectCreationThrottle</key> + <map> + <key>Comment</key> + <string>maximum number of new objects created per frame, -1 to disable this throttle</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>64</integer> + </map> <key>NextOwnerCopy</key> <map> <key>Comment</key> |