diff options
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/llxml/llxmlnode.cpp | 5 | ||||
-rw-r--r-- | linden/indra/llxml/llxmlnode.h | 2 |
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, | |||
499 | pos += 2; | 499 | pos += 2; |
500 | } | 500 | } |
501 | 501 | ||
502 | if (parent) | 502 | parent->addChild(new_node); |
503 | { | ||
504 | parent->addChild(new_node); | ||
505 | } | ||
506 | } | 503 | } |
507 | 504 | ||
508 | void XMLCALL EndXMLNode(void *userData, | 505 | 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: | |||
245 | void setFloatValue(const F32 value, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0) { setFloatValue(1, &value, encoding); } | 245 | void setFloatValue(const F32 value, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0) { setFloatValue(1, &value, encoding); } |
246 | void setDoubleValue(const F64 value, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0) { setDoubleValue(1, &value, encoding); } | 246 | void setDoubleValue(const F64 value, Encoding encoding = ENCODING_DEFAULT, U32 precision = 0) { setDoubleValue(1, &value, encoding); } |
247 | void setStringValue(const std::string& value) { setStringValue(1, &value); } | 247 | void setStringValue(const std::string& value) { setStringValue(1, &value); } |
248 | void setUUIDValue(const LLUUID value) { setUUIDValue(1, &value); } | 248 | void setUUIDValue(const LLUUID& value) { setUUIDValue(1, &value); } |
249 | void setNodeRefValue(const LLXMLNode *value) { setNodeRefValue(1, &value); } | 249 | void setNodeRefValue(const LLXMLNode *value) { setNodeRefValue(1, &value); } |
250 | 250 | ||
251 | void setBoolValue(U32 length, const BOOL *array); | 251 | void setBoolValue(U32 length, const BOOL *array); |