diff options
| author | David Walter Seikel | 2012-02-20 22:10:26 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2012-02-20 22:10:26 +1000 |
| commit | ca7fd07f6600f73bd2050c1499e379f7d5038fa9 (patch) | |
| tree | 310d5ab5e3f9d4164b9220a152618bb2ed2162ba /linden/indra/newview/app_settings/logcontrol.xml | |
| parent | Support the new WindlightReset message from OpenSim for resetting Windlight p... (diff) | |
| parent | Adding my linux build scripts. Makes it easy to build under 32 and 64 bit li... (diff) | |
| download | meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.zip meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.tar.gz meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.tar.bz2 meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.tar.xz | |
Merge branch 'next' of git://github.com/imprudence/imprudence into next
Conflicts:
linden/indra/newview/installers/windows/meta-impy_installer_template.iss
Branding conflict, fixed.
linden/indra/newview/llviewerwindow.cpp
Already had this change, but merged the minor difference.
Diffstat (limited to 'linden/indra/newview/app_settings/logcontrol.xml')
| -rw-r--r-- | linden/indra/newview/app_settings/logcontrol.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml index 74a8189..c979d73 100644 --- a/linden/indra/newview/app_settings/logcontrol.xml +++ b/linden/indra/newview/app_settings/logcontrol.xml | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | <!--<string>AudioEngine</string>--> | 53 | <!--<string>AudioEngine</string>--> |
| 54 | <!--<string>BodyPhysics</string>--> | 54 | <!--<string>BodyPhysics</string>--> |
| 55 | <!--<string>InitInfo</string>--> | 55 | <!--<string>InitInfo</string>--> |
| 56 | <string>Inventory</string> | 56 | <!--<string>Inventory</string>--> |
| 57 | <!--<string>isOwnedSelf</string>--> | 57 | <!--<string>isOwnedSelf</string>--> |
| 58 | <!--<string>HUDEffect</string>--> | 58 | <!--<string>HUDEffect</string>--> |
| 59 | <!--<string>MarkerFile</string>--> | 59 | <!--<string>MarkerFile</string>--> |