diff options
author | Armin Weatherwax | 2010-06-14 12:04:49 +0200 |
---|---|---|
committer | Armin Weatherwax | 2010-09-23 15:38:25 +0200 |
commit | 35df5441d3e2789663532c948731aff3a1e04728 (patch) | |
tree | ac7674289784a5f96106ea507637055a8dada78a /linden/indra/newview/app_settings | |
parent | Changed version to Experimental 2010.09.18 (diff) | |
download | meta-impy-35df5441d3e2789663532c948731aff3a1e04728.zip meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.gz meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.bz2 meta-impy-35df5441d3e2789663532c948731aff3a1e04728.tar.xz |
llmediaplugins first step
Diffstat (limited to 'linden/indra/newview/app_settings')
-rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 0a27aa2..4d80845 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
@@ -7624,7 +7624,40 @@ | |||
7624 | <key>Value</key> | 7624 | <key>Value</key> |
7625 | <integer>0</integer> | 7625 | <integer>0</integer> |
7626 | </map> | 7626 | </map> |
7627 | <key>MemoryLogFrequency</key> | 7627 | <key>MediaControlFadeTime</key> |
7628 | <map> | ||
7629 | <key>Comment</key> | ||
7630 | <string>Amount of time (in seconds) that the media control fades</string> | ||
7631 | <key>Persist</key> | ||
7632 | <integer>1</integer> | ||
7633 | <key>Type</key> | ||
7634 | <string>F32</string> | ||
7635 | <key>Value</key> | ||
7636 | <real>1.5</real> | ||
7637 | </map> | ||
7638 | <key>MediaControlTimeout</key> | ||
7639 | <map> | ||
7640 | <key>Comment</key> | ||
7641 | <string>Amount of time (in seconds) for media controls to fade with no mouse activity</string> | ||
7642 | <key>Persist</key> | ||
7643 | <integer>1</integer> | ||
7644 | <key>Type</key> | ||
7645 | <string>F32</string> | ||
7646 | <key>Value</key> | ||
7647 | <real>3.0</real> | ||
7648 | </map> | ||
7649 | <key>MediaOnAPrimUI</key> | ||
7650 | <map> | ||
7651 | <key>Comment</key> | ||
7652 | <string>Whether or not to show the "link sharing" UI</string> | ||
7653 | <key>Persist</key> | ||
7654 | <integer>1</integer> | ||
7655 | <key>Type</key> | ||
7656 | <string>Boolean</string> | ||
7657 | <key>Value</key> | ||
7658 | <integer>0</integer> | ||
7659 | </map> | ||
7660 | <key>MemoryLogFrequency</key> | ||
7628 | <map> | 7661 | <map> |
7629 | <key>Comment</key> | 7662 | <key>Comment</key> |
7630 | <string>Seconds between display of Memory in log (0 for never)</string> | 7663 | <string>Seconds between display of Memory in log (0 for never)</string> |