aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llxml
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llxml')
-rw-r--r--linden/indra/llxml/llcontrol.cpp2
-rw-r--r--linden/indra/llxml/llxmlnode.h3
2 files changed, 3 insertions, 2 deletions
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)
536void LLControlGroup::setRect(const LLString& name, const LLRect &val) 536void LLControlGroup::setRect(const LLString& name, const LLRect &val)
537{ 537{
538 LLControlBase* control = getControl(name); 538 LLControlBase* control = getControl(name);
539 539
540 if (control && control->isType(TYPE_RECT)) 540 if (control && control->isType(TYPE_RECT))
541 { 541 {
542 control->set(val.getValue()); 542 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:
183 const LLString& getValue() const { return mValue; } 183 const LLString& getValue() const { return mValue; }
184 LLString getTextContents() const; 184 LLString getTextContents() const;
185 const LLStringTableEntry* getName() const { return mName; } 185 const LLStringTableEntry* getName() const { return mName; }
186 BOOL hasName(LLString name) const { return mName == gStringTable.checkStringEntry(name); } 186 BOOL hasName(const char* name) const { return mName == gStringTable.checkStringEntry(name); }
187 BOOL hasName(LLString name) const { return mName == gStringTable.checkStringEntry(name.c_str()); }
187 const LLString& getID() const { return mID; } 188 const LLString& getID() const { return mID; }
188 189
189 U32 getChildCount() const; 190 U32 getChildCount() const;