diff options
| author | angela <angela@lindenlab.com> | 2009-10-27 13:26:50 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-10-27 13:26:50 +0800 |
| commit | 773ce219c6317dc753369fa280d5d7f6c4b23550 (patch) | |
| tree | cbfc416e124efa20726d1db10a3324732cafb269 /indra/llui/lliconctrl.cpp | |
| parent | f60314f22758daa22d096f2166367258d761d8b4 (diff) | |
| parent | 4767b546e6917ab4b2561553cf617d577fe998ff (diff) | |
merge
Diffstat (limited to 'indra/llui/lliconctrl.cpp')
| -rw-r--r-- | indra/llui/lliconctrl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp index 0330a2b374..66c2ba682f 100644 --- a/indra/llui/lliconctrl.cpp +++ b/indra/llui/lliconctrl.cpp @@ -56,7 +56,8 @@ LLIconCtrl::Params::Params() LLIconCtrl::LLIconCtrl(const LLIconCtrl::Params& p) : LLUICtrl(p), mColor(p.color()), - mImagep(p.image) + mImagep(p.image), + mPriority(0) { if (mImagep.notNull()) { @@ -93,11 +94,11 @@ void LLIconCtrl::setValue(const LLSD& value ) LLUICtrl::setValue(tvalue); if (tvalue.isUUID()) { - mImagep = LLUI::getUIImageByID(tvalue.asUUID()); + mImagep = LLUI::getUIImageByID(tvalue.asUUID(), mPriority); } else { - mImagep = LLUI::getUIImage(tvalue.asString()); + mImagep = LLUI::getUIImage(tvalue.asString(), mPriority); } } |