diff options
author | andreykproductengine <akleshchev@productengine.com> | 2016-03-29 18:52:54 +0300 |
---|---|---|
committer | andreykproductengine <akleshchev@productengine.com> | 2016-03-29 18:52:54 +0300 |
commit | 0e155c51a95f092dda4f1ee71b4de46c7e98c10d (patch) | |
tree | 4b43aa9a820613fbcd58eddf4959feff6dbfe600 /indra/llui | |
parent | 783cc9756ad6cc07d27bf985171c922aa20b0fc8 (diff) |
MAINT-6257 Textures loading issues.
Diffstat (limited to 'indra/llui')
-rwxr-xr-x | indra/llui/lliconctrl.cpp | 11 | ||||
-rwxr-xr-x | indra/llui/lliconctrl.h | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp index f841901801..82b01e705d 100755 --- a/indra/llui/lliconctrl.cpp +++ b/indra/llui/lliconctrl.cpp @@ -83,7 +83,12 @@ void LLIconCtrl::draw() // virtual // value might be a string or a UUID -void LLIconCtrl::setValue(const LLSD& value ) +void LLIconCtrl::setValue(const LLSD& value) +{ + setValue(value, mPriority); +} + +void LLIconCtrl::setValue(const LLSD& value, S32 priority) { LLSD tvalue(value); if (value.isString() && LLUUID::validate(value.asString())) @@ -94,11 +99,11 @@ void LLIconCtrl::setValue(const LLSD& value ) LLUICtrl::setValue(tvalue); if (tvalue.isUUID()) { - mImagep = LLUI::getUIImageByID(tvalue.asUUID(), mPriority); + mImagep = LLUI::getUIImageByID(tvalue.asUUID(), priority); } else { - mImagep = LLUI::getUIImage(tvalue.asString(), mPriority); + mImagep = LLUI::getUIImage(tvalue.asString(), priority); } if(mImagep.notNull() diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h index 7971cd44d3..dd83e78fd3 100755 --- a/indra/llui/lliconctrl.h +++ b/indra/llui/lliconctrl.h @@ -59,6 +59,8 @@ protected: LLIconCtrl(const Params&); friend class LLUICtrlFactory; + void setValue(const LLSD& value, S32 priority); + public: virtual ~LLIconCtrl(); |