diff options
| author | Jonathan Yap <none@none> | 2013-11-19 16:56:17 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-11-19 16:56:17 -0500 |
| commit | 410a084f9a2e030efda635f5a51280b599ab7f78 (patch) | |
| tree | 2c2f095cee8cf0b233d59eee2c8d99ad68c44c70 /indra/newview/app_settings/settings.xml | |
| parent | dad992ea31b6b823c316400e61d50d1aa9e52330 (diff) | |
| parent | fcc885d4fc5ef63dad33e89a9324edc39d466d37 (diff) | |
STORM-1980 Merge changes Oz made (new way of detecting an agent has changed regions)
Modify code to make use of the changed callback
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index be5f81e7e7..abe7b95266 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5942,6 +5942,17 @@ <key>Value</key> <real>1.6</real> </map> + <key>MaxPersistentNotifications</key> + <map> + <key>Comment</key> + <string>Maximum amount of persistent notifications</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <real>250</real> + </map> <key>MaxSelectDistance</key> <map> <key>Comment</key> @@ -9850,7 +9861,7 @@ <key>RenderUseVAO</key> <map> <key>Comment</key> - <string>[EXPERIMENTAL] Use GL Vertex Array Objects</string> + <string>[EXPERIMENTAL] Use GL Vertex Array Objects.</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -13345,7 +13356,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>-1</string> + <string>0</string> </map> <key>VivoxDebugSIPURIHostName</key> <map> |