diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-06 11:00:47 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-06 11:00:47 -0400 |
| commit | 2d8b53854ebc1db5cceda1e1b5d6abbbc6c08728 (patch) | |
| tree | 56388b12b66b42059841faeadac6f110abc18d21 /indra/llui/lliconctrl.cpp | |
| parent | e0cb5438a5055c71191c6ae6b27c7dee63e40562 (diff) | |
| parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) | |
merge
Diffstat (limited to 'indra/llui/lliconctrl.cpp')
| -rwxr-xr-x | indra/llui/lliconctrl.cpp | 11 |
1 files changed, 8 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() |