diff options
| author | richard <none@none> | 2009-12-21 18:12:17 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-12-21 18:12:17 -0800 |
| commit | 18e25641fecd526cd2a2bb074311056101b3456a (patch) | |
| tree | 3ff89da9566a7f7b602b201d19bda7ff43c99134 /indra/llui/lluiimage.cpp | |
| parent | e6a8b3e2b2b3a352c674a788d27ac2d5f35983f8 (diff) | |
| parent | 5b978865e3b09e5b911728cd6381a2a4a7b3a9d3 (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()); |