diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-13 10:19:05 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-13 10:19:05 +0100 |
commit | d071cff43fa9529ded274b2aa0c929efbb6f6c91 (patch) | |
tree | bf46a0be9f5f1a92ce26a5aa50e6e867cd0e656f /indra/newview/app_settings | |
parent | 95343d8085d98cf0927747298cd4af7a9ea90766 (diff) | |
parent | 4f20b91acdddc06b7e033afa42e19f993f7efb30 (diff) |
PE merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index dd38965a5a..3197064281 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10646,6 +10646,28 @@ <key>Value</key> <real>50.0</real> </map> + <key>WellIconFlashCount</key> + <map> + <key>Comment</key> + <string>Number of flashes of IM Well and Notification Well icons after which flashing buttons stay lit up. Requires restart.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>3</integer> + </map> + <key>WellIconFlashPeriod</key> + <map> + <key>Comment</key> + <string>Period at which IM Well and Notification Well icons flash (seconds). Requires restart.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>0.25</real> + </map> <key>WindLightUseAtmosShaders</key> <map> <key>Comment</key> |