3 files changed, 10 insertions, 7 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/llcontrol.h b/indra/llxml/llcontrol.h
index 4f54a9d705..da7268bf45 100644
--- a/indra/llxml/llcontrol.h
+++ b/indra/llxml/llcontrol.h
@@ -28,15 +28,15 @@
 #define LL_LLCONTROL_H
 
 #include "llboost.h"
-#include "llevent.h"
 #include "llstring.h"
+#include "llpointer.h"
 #include "llrect.h"
 #include "llrefcount.h"
 #include "llinstancetracker.h"
 
+#include <functional>
 #include <vector>
 
-#include <boost/bind.hpp>
 #include <boost/signals2.hpp>
 
 class LLVector3;
@@ -341,7 +341,7 @@ private:
         // Add a listener to the controls signal...
         // NOTE: All listeners connected to 0 group, for guaranty that variable handlers (gSavedSettings) call last
         mConnection = controlp->getSignal()->connect(0,
-            boost::bind(&LLControlCache<T>::handleValueChange, this, _2)
+            std::bind(&LLControlCache<T>::handleValueChange, this, std::placeholders::_2)
             );
         mType = controlp->type();
     }
@@ -400,7 +400,7 @@ public:
     }
 
     operator const T&() const { return mCachedControlPtr->getValue(); }
-    operator boost::function<const T&()> () const { return boost::function<const T&()>(*this); }
+    operator std::function<const T&()> () const { return std::function<const T&()>(*this); }
     const T& operator()() { return mCachedControlPtr->getValue(); }
 
 private:
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;