diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-11-10 17:10:47 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-11-10 17:10:47 -0800 |
| commit | d181b84dfdce83d1999d086c3eda2cdc51849a11 (patch) | |
| tree | a21574f711780b0e8377a8e59c7a322a23f30594 /indra/llui/lluiimage.cpp | |
| parent | c9937716aa3a1f7aac0e93fc1d58488d02d30e6e (diff) | |
EXT-1478 Tool-tip background and border colors are being ignored
EXT-2082 Multifloater preview tab container extends outside window border
EXT-773 odd notecard behaviour on closing an unsaved notcard
reviewed by Richard
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) { |