summaryrefslogtreecommitdiff
path: root/indra/llui/lluiimage.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2009-12-23 10:00:41 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2009-12-23 10:00:41 +0200
commit633c15570a52082030667ec2d096058f16ccf228 (patch)
tree674de11ffa2ee17e36e226e698a327ec55aa1481 /indra/llui/lluiimage.cpp
parent4d9762eb846ae1894f0c31eecb6230803018e730 (diff)
parent0a98034641267ea57360fdd369acb8b94ff9bc20 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui/lluiimage.cpp')
-rw-r--r--indra/llui/lluiimage.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lluiimage.cpp b/indra/llui/lluiimage.cpp
index 1dfc281d93..966d919dc7 100644
--- a/indra/llui/lluiimage.cpp
+++ b/indra/llui/lluiimage.cpp
@@ -168,6 +168,7 @@ namespace LLInitParam
if (name() == "none")
{
mData.mValue = NULL;
+ return;
}
LLUIImage* imagep = LLUI::getUIImage(name());