diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-11 17:47:20 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-11 17:47:20 +0200 |
| commit | 6146cfc5c1c14f106b54b7394db6286d9b7bb67a (patch) | |
| tree | f29e14c852a36d1b97defd0f126068deec8ed3b6 /indra/llui/lluiimage.cpp | |
| parent | 61fdd33f7916dbf13c5c56e2d4c0ccb14fdae150 (diff) | |
| parent | 062d0a13db505636b186084d42c527a49637f380 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lluiimage.cpp')
| -rw-r--r-- | indra/llui/lluiimage.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llui/lluiimage.cpp b/indra/llui/lluiimage.cpp index 6c1a32722f..a8683e55c3 100644 --- a/indra/llui/lluiimage.cpp +++ b/indra/llui/lluiimage.cpp @@ -142,6 +142,13 @@ namespace LLInitParam { LLUIImage* TypedParam<LLUIImage*>::getValueFromBlock() const { + // The keyword "none" is specifically requesting a null image + // do not default to current value. Used to overwrite template images. + if (name() == "none") + { + return NULL; + } + LLUIImage* imagep = LLUI::getUIImage(name()); if (!imagep) { |