From 5cc44523f79b6cf495d2649fce9bf9e5181787e8 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Fri, 9 Feb 2007 23:35:12 +0000
Subject: Result of svn merge -r57350:57790
 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.

---
 indra/llxml/llxmlnode.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llxml')

diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp
index 0789ec6842..131fb7bb3c 100644
--- a/indra/llxml/llxmlnode.cpp
+++ b/indra/llxml/llxmlnode.cpp
@@ -2275,7 +2275,7 @@ void LLXMLNode::setUUIDValue(U32 length, const LLUUID *array)
 	LLString new_value;
 	for (U32 pos=0; pos<length; ++pos)
 	{
-		new_value.append(array[pos].getString());
+		new_value.append(array[pos].asString());
 		if (pos < length-1) new_value.append(" ");
 	}
 
@@ -2877,7 +2877,7 @@ BOOL LLXMLNode::performUnitTest(LLString &error_buffer)
 		}
 		if (node_uuid_checksum != uuid_checksum)
 		{
-			error_buffer.append(llformat("ERROR Node %s: UUID checksum mismatch: read %s / calc %s.\n", mName->mString, node_uuid_checksum.getString().c_str(), uuid_checksum.getString().c_str()));
+			error_buffer.append(llformat("ERROR Node %s: UUID checksum mismatch: read %s / calc %s.\n", mName->mString, node_uuid_checksum.asString().c_str(), uuid_checksum.asString().c_str()));
 			return FALSE;
 		}
 	}
-- 
cgit v1.2.3