diff options
| author | Armin Weatherwax | 2011-06-16 14:31:08 +0200 |
|---|---|---|
| committer | Armin Weatherwax | 2011-11-13 14:28:27 +0100 |
| commit | f8864a146bd0e7a871f5ce27f92683df66729dab (patch) | |
| tree | 3fc77b1c3d5ffe9b5bac2bf3ecb1f013a8f54c22 /linden/indra/llxml/llxmlnode.cpp | |
| parent | fix pass LLSD& instead LLSD to selectByValue (diff) | |
| download | meta-impy-f8864a146bd0e7a871f5ce27f92683df66729dab.zip meta-impy-f8864a146bd0e7a871f5ce27f92683df66729dab.tar.gz meta-impy-f8864a146bd0e7a871f5ce27f92683df66729dab.tar.bz2 meta-impy-f8864a146bd0e7a871f5ce27f92683df66729dab.tar.xz | |
2 fixes in llxmlnode: pass LLUUID& instead of LLUUID to setUUIDValue; remove superfluous NULL pointer check
Diffstat (limited to 'linden/indra/llxml/llxmlnode.cpp')
| -rw-r--r-- | linden/indra/llxml/llxmlnode.cpp | 5 |
1 files changed, 1 insertions, 4 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, |