diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-06-19 11:46:51 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-06-19 11:46:51 -0600 |
| commit | 7d88994edc38cf1c037877a5c7c86e35818b7b79 (patch) | |
| tree | 94bcc8c30dacf3955c26b9aa54ce3f47e40f52a8 /indra/newview/app_settings | |
| parent | c5fc8f90060aa7a6c8fbb72313172423b01eddc5 (diff) | |
| parent | b38170e6817b3f69274d9b5953584a1278a17ca2 (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 4d5b0c62e4..29427bbaa3 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4590,6 +4590,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>InvisibleObjectsInMemoryTime</key> + <map> + <key>Comment</key> + <string>Number of frames invisible objects stay in memory before being removed. 0 means never to remove.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>U32</string> + <key>Value</key> + <integer>64</integer> + </map> <key>JoystickAvatarEnabled</key> <map> <key>Comment</key> |