diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/llui/lliconctrl.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/llui/lliconctrl.cpp')
| -rw-r--r-- | indra/llui/lliconctrl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp index df37532d60..2638bdc3e5 100644 --- a/indra/llui/lliconctrl.cpp +++ b/indra/llui/lliconctrl.cpp @@ -44,7 +44,7 @@ const F32 RESOLUTION_BUMP = 1.f; static LLRegisterWidget<LLIconCtrl> r("icon"); -LLIconCtrl::LLIconCtrl(const LLString& name, const LLRect &rect, const LLUUID &image_id) +LLIconCtrl::LLIconCtrl(const std::string& name, const LLRect &rect, const LLUUID &image_id) : LLUICtrl(name, rect, FALSE, // mouse opaque @@ -56,7 +56,7 @@ LLIconCtrl::LLIconCtrl(const LLString& name, const LLRect &rect, const LLUUID &i setTabStop(FALSE); } -LLIconCtrl::LLIconCtrl(const LLString& name, const LLRect &rect, const LLString &image_name) +LLIconCtrl::LLIconCtrl(const std::string& name, const LLRect &rect, const std::string &image_name) : LLUICtrl(name, rect, FALSE, // mouse opaque @@ -76,7 +76,7 @@ LLIconCtrl::~LLIconCtrl() } -void LLIconCtrl::setImage(const LLString& image_name) +void LLIconCtrl::setImage(const std::string& image_name) { //RN: support UUIDs masquerading as strings if (LLUUID::validate(image_name)) @@ -148,13 +148,13 @@ LLXMLNodePtr LLIconCtrl::getXML(bool save_children) const LLView* LLIconCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory) { - LLString name("icon"); + std::string name("icon"); node->getAttributeString("name", name); LLRect rect; createRect(node, rect, parent, LLRect()); - LLString image_name; + std::string image_name; if (node->hasAttribute("image_name")) { node->getAttributeString("image_name", image_name); |