From 3f27ba891ac4d032753b219b4b96d1ffbc9fb488 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:16 -0500
Subject: Second Life viewer sources 1.18.5.0-RC

---
 linden/indra/llxml/llcontrol.cpp | 2 +-
 linden/indra/llxml/llxmlnode.h   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'linden/indra/llxml')

diff --git a/linden/indra/llxml/llcontrol.cpp b/linden/indra/llxml/llcontrol.cpp
index 30c6394..11f3c13 100644
--- a/linden/indra/llxml/llcontrol.cpp
+++ b/linden/indra/llxml/llcontrol.cpp
@@ -536,7 +536,7 @@ void LLControlGroup::setVector3d(const LLString& name, const LLVector3d &val)
 void LLControlGroup::setRect(const LLString& name, const LLRect &val)
 {
 	LLControlBase* control = getControl(name);
-	
+
 	if (control && control->isType(TYPE_RECT))
 	{
 		control->set(val.getValue());
diff --git a/linden/indra/llxml/llxmlnode.h b/linden/indra/llxml/llxmlnode.h
index 7c22157..e2019a8 100644
--- a/linden/indra/llxml/llxmlnode.h
+++ b/linden/indra/llxml/llxmlnode.h
@@ -183,7 +183,8 @@ public:
     const LLString& getValue() const { return mValue; }
 	LLString getTextContents() const;
     const LLStringTableEntry* getName() const { return mName; }
-	BOOL hasName(LLString name) const { return mName == gStringTable.checkStringEntry(name); }
+	BOOL hasName(const char* name) const { return mName == gStringTable.checkStringEntry(name); }
+	BOOL hasName(LLString name) const { return mName == gStringTable.checkStringEntry(name.c_str()); }
     const LLString& getID() const { return mID; }
 
     U32 getChildCount() const;
-- 
cgit v1.1