diff options
| author | McCabe Maxsted | 2011-03-04 21:35:09 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-03-04 21:35:09 -0700 |
| commit | 8e616edb3d12024518994e3d64d6b5dd009f6568 (patch) | |
| tree | 9025b676911e17ccafe2341cc2958df032eb3a71 /linden/indra/newview/app_settings/logcontrol.xml | |
| parent | Merge remote branch 'thickbrick/weekly' into weekly (diff) | |
| parent | update openal and pulse headers to pulseaudio 0.9.21 on linux* (diff) | |
| download | meta-impy-8e616edb3d12024518994e3d64d6b5dd009f6568.zip meta-impy-8e616edb3d12024518994e3d64d6b5dd009f6568.tar.gz meta-impy-8e616edb3d12024518994e3d64d6b5dd009f6568.tar.bz2 meta-impy-8e616edb3d12024518994e3d64d6b5dd009f6568.tar.xz | |
Merge remote branch 'armin/weekly' into weekly
Diffstat (limited to 'linden/indra/newview/app_settings/logcontrol.xml')
| -rw-r--r-- | linden/indra/newview/app_settings/logcontrol.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml index 2c6c6a4..51bb456 100644 --- a/linden/indra/newview/app_settings/logcontrol.xml +++ b/linden/indra/newview/app_settings/logcontrol.xml | |||
| @@ -57,7 +57,7 @@ | |||
| 57 | <!--<string>Inventory</string>--> | 57 | <!--<string>Inventory</string>--> |
| 58 | <!--<string>HUDEffect</string>--> | 58 | <!--<string>HUDEffect</string>--> |
| 59 | <!--<string>MarkerFile</string>--> | 59 | <!--<string>MarkerFile</string>--> |
| 60 | <!--<string>MediaImpl</string>--> | 60 | <!--<string>Media</string>--> |
| 61 | <!--<string>MediaInfo</string>--> | 61 | <!--<string>MediaInfo</string>--> |
| 62 | <!--<string>MediaCallback</string>--> | 62 | <!--<string>MediaCallback</string>--> |
| 63 | <!--<string>MediaBuffering</string>--> | 63 | <!--<string>MediaBuffering</string>--> |
| @@ -65,6 +65,8 @@ | |||
| 65 | <!--<string>MediaState</string>--> | 65 | <!--<string>MediaState</string>--> |
| 66 | 66 | ||
| 67 | <!--<string>Messaging</string>--> | 67 | <!--<string>Messaging</string>--> |
| 68 | |||
| 69 | <string>NewsBar</string> | ||
| 68 | <!--<string>Notifications</string>--> | 70 | <!--<string>Notifications</string>--> |
| 69 | 71 | ||
| 70 | <!--<string>Plugin</string>--> | 72 | <!--<string>Plugin</string>--> |