2 fixes in llxmlnode: pass LLUUID& instead of LLUUID to setUUIDValue; remove superfluous NULL pointer check

2 files changed, 2 insertions, 5 deletions

diff --git a/linden/indra/llxml/llxmlnode.cpp b/linden/indra/llxml/llxmlnode.cpp
index 5bb5012..0e2f9a2 100644
--- a/linden/indra/llxml/llxmlnode.cpp
+++ b/linden/indra/llxml/llxmlnode.cpp
@@ -499,10 +499,7 @@ void XMLCALL StartXMLNode(void *userData,
                 pos += 2;
         }
 
-        if (parent)
-        {
-                parent->addChild(new_node);
-        }
+        parent->addChild(new_node);
 }
 
 void XMLCALL EndXMLNode(void *userData,
diff --git a/linden/indra/llxml/llxmlnode.h b/linden/indra/llxml/llxmlnode.h
index ab1a772..d71a221 100644
--- a/linden/indra/llxml/llxmlnode.h
+++ b/linden/indra/llxml/llxmlnode.h
@@ -245,7 +245,7 @@ public:
         void setFloatValue(const F32 value, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0) { setFloatValue(1, &value, encoding); }
         void setDoubleValue(const F64 value, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0) { setDoubleValue(1, &value, encoding); }
         void setStringValue(const std::string& value) { setStringValue(1, &value); }
-        void setUUIDValue(const LLUUID value) { setUUIDValue(1, &value); }
+        void setUUIDValue(const LLUUID& value) { setUUIDValue(1, &value); }
         void setNodeRefValue(const LLXMLNode *value) { setNodeRefValue(1, &value); }
 
         void setBoolValue(U32 length, const BOOL *array);