summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-06-13 16:34:37 +0100
committerGraham Linden <graham@lindenlab.com>2018-06-13 16:34:37 +0100
commitc07775798e0adb134a2b5df8295bdb0ed7d374bc (patch)
tree27b0d653b7d609282b46549ea7b42f54e09de4e7 /indra
parent34865c4bb5cd12219606f44748159fe7cbeea264 (diff)
Fix logcontrol.xml with broken XML and put extra warn logging when live files fail to load.
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/lllivefile.cpp1
-rw-r--r--indra/newview/app_settings/logcontrol.xml3
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/lllivefile.cpp b/indra/llcommon/lllivefile.cpp
index ea485c2d86..4b73ff691a 100644
--- a/indra/llcommon/lllivefile.cpp
+++ b/indra/llcommon/lllivefile.cpp
@@ -150,6 +150,7 @@ bool LLLiveFile::checkAndReload()
}
else
{
+ LL_WARNS() << "Failed to load live file " << filename() << LL_ENDL;
changed = false;
}
}
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 670dfe2dec..ecd7c4bc36 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -35,7 +35,7 @@
</array>
<key>tags</key>
<array>
- </array>
+ </array>
</map>
<map>
<key>level</key><string>DEBUG</string>
@@ -50,7 +50,6 @@
</array>
<key>tags</key>
<array>
- <string>ShaderErrors/string>
<!-- sample entry for debugging specific items
<string>Avatar</string>
<string>Inventory</string>