4 files changed, 8 insertions, 5 deletions
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp
index bb590ebd76..562a30e8d1 100644
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -157,6 +157,9 @@ LLControlVariable::LLControlVariable(const std::string& name, eControlType type,
 {
     if ((persist != PERSIST_NO) && mComment.empty())
     {
+        // File isn't actually missing, but something is wrong with it
+        // so the main point is to warn user to reinstall
+        LLError::LLUserWarningMsg::showMissingFiles();
         LL_ERRS() << "Must supply a comment for control " << mName << LL_ENDL;
     }
     //Push back versus setValue'ing here, since we don't want to call a signal yet
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp
index 8a2c36a307..16860ab8b8 100644
--- a/indra/llxml/llxmlnode.cpp
+++ b/indra/llxml/llxmlnode.cpp
@@ -1285,7 +1285,7 @@ bool LLXMLNode::getAttributeU8(const char* name, U8& value )
 bool LLXMLNode::getAttributeS8(const char* name, S8& value )
 {
     LLXMLNodePtr node;
-    S32 val;
+    S32 val{};
     if (!(getAttribute(name, node) && node->getIntValue(1, &val)))
     {
         return false;
@@ -1297,7 +1297,7 @@ bool LLXMLNode::getAttributeS8(const char* name, S8& value )
 bool LLXMLNode::getAttributeU16(const char* name, U16& value )
 {
     LLXMLNodePtr node;
-    U32 val;
+    U32 val{};
     if (!(getAttribute(name, node) && node->getUnsignedValue(1, &val)))
     {
         return false;
@@ -1309,7 +1309,7 @@ bool LLXMLNode::getAttributeU16(const char* name, U16& value )
 bool LLXMLNode::getAttributeS16(const char* name, S16& value )
 {
     LLXMLNodePtr node;
-    S32 val;
+    S32 val{};
     if (!(getAttribute(name, node) && node->getIntValue(1, &val)))
     {
         return false;
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h
index 09c7c4fdad..769cf97ba2 100644
--- a/indra/llxml/llxmlnode.h
+++ b/indra/llxml/llxmlnode.h
@@ -30,7 +30,7 @@
 #ifndef XML_STATIC
 #define XML_STATIC
 #endif
-#ifdef LL_USESYSTEMLIBS
+#if 1
 #include <expat.h>
 #else
 #include "expat/expat.h"
diff --git a/indra/llxml/llxmlparser.h b/indra/llxml/llxmlparser.h
index 0f64def6df..9c25727e54 100644
--- a/indra/llxml/llxmlparser.h
+++ b/indra/llxml/llxmlparser.h
@@ -30,7 +30,7 @@
 #ifndef XML_STATIC
 #define XML_STATIC
 #endif
-#ifdef LL_USESYSTEMLIBS
+#if 1
 #include <expat.h>
 #else
 #include "expat/expat.h"