diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2009-12-22 14:06:48 -0600 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2009-12-22 14:06:48 -0600 |
| commit | 616ca198143e7cc3f925add2c3b83aaf5d2fe244 (patch) | |
| tree | a6f234275727009d196dbd6070753bcb02699bb0 /indra/llui/lluiimage.cpp | |
| parent | 8f8e5c850a0574f30f9be1e3164531751139d2c5 (diff) | |
| parent | e72a3c63ec44255172e253fe43e192918ec6117e (diff) | |
Merge
Diffstat (limited to 'indra/llui/lluiimage.cpp')
| -rw-r--r-- | indra/llui/lluiimage.cpp | 1 |
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()); |