diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-11-10 17:12:29 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-11-10 17:12:29 -0800 |
| commit | 7eff61af30d68738445628edf1e52254e5f8fc24 (patch) | |
| tree | 4cf178cc930d58c2e0034ab522add1362f74234e /indra/llui/lluiimage.cpp | |
| parent | 9d2102519d88feec434b79e1d9bb7d86ac6e7794 (diff) | |
| parent | d181b84dfdce83d1999d086c3eda2cdc51849a11 (diff) | |
merge
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) { |