diff options
| author | McCabe Maxsted | 2009-04-02 08:03:59 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-04-02 08:03:59 -0700 |
| commit | f305714a96729f42edecdc3d7a544383bece7ba4 (patch) | |
| tree | 24d844d82b77957e763e6bc9a3103e29aa77f5f3 /linden/indra/newview/app_settings | |
| parent | Cleaned up logic for bad streams (diff) | |
| parent | Apply saved MediaDebugLevel at media init time. (diff) | |
| download | meta-impy-f305714a96729f42edecdc3d7a544383bece7ba4.zip meta-impy-f305714a96729f42edecdc3d7a544383bece7ba4.tar.gz meta-impy-f305714a96729f42edecdc3d7a544383bece7ba4.tar.bz2 meta-impy-f305714a96729f42edecdc3d7a544383bece7ba4.tar.xz | |
Fixed merge conflicts
Diffstat (limited to 'linden/indra/newview/app_settings')
| -rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 7405aad..1ecab2b 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
| @@ -4659,6 +4659,17 @@ | |||
| 4659 | <key>Value</key> | 4659 | <key>Value</key> |
| 4660 | <integer>0</integer> | 4660 | <integer>0</integer> |
| 4661 | </map> | 4661 | </map> |
| 4662 | <key>MediaDebugLevel</key> | ||
| 4663 | <map> | ||
| 4664 | <key>Comment</key> | ||
| 4665 | <string>How spammy media (GStreamer) debug output should be. (0-4)</string> | ||
| 4666 | <key>Persist</key> | ||
| 4667 | <integer>1</integer> | ||
| 4668 | <key>Type</key> | ||
| 4669 | <string>U32</string> | ||
| 4670 | <key>Value</key> | ||
| 4671 | <integer>0</integer> | ||
| 4672 | </map> | ||
| 4662 | <key>MemoryLogFrequency</key> | 4673 | <key>MemoryLogFrequency</key> |
| 4663 | <map> | 4674 | <map> |
| 4664 | <key>Comment</key> | 4675 | <key>Comment</key> |