From 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 1 Nov 2007 22:02:35 +0000 Subject: svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release QAR-11: pair-reviewed the merge w/ Sam. --- indra/llxml/llcontrol.cpp | 2 +- indra/llxml/llxmlnode.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/llxml') diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index 30c6394fcb..11f3c132bb 100644 --- a/indra/llxml/llcontrol.cpp +++ b/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/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h index 7c221574ac..e2019a8e60 100644 --- a/indra/llxml/llxmlnode.h +++ b/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.2.3