diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
| commit | baa73fddd9287ddafd2d31551cb253b355ed910a (patch) | |
| tree | e3f0986617fe6c0ee0a14df6aac13c6bb6f92507 /indra/llui/lluiimage.cpp | |
| parent | dc3833f31b8a20220ddb1775e1625c016c397435 (diff) | |
| parent | fcaa1ad46fd1df4cfec9dee12caf6e7b5bf32136 (diff) | |
Merge with viewer-2.0.0-3 branch
Diffstat (limited to 'indra/llui/lluiimage.cpp')
| -rw-r--r-- | indra/llui/lluiimage.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/llui/lluiimage.cpp b/indra/llui/lluiimage.cpp index 0ed2283742..8e0de0cb0c 100644 --- a/indra/llui/lluiimage.cpp +++ b/indra/llui/lluiimage.cpp @@ -49,6 +49,10 @@ LLUIImage::LLUIImage(const std::string& name, LLPointer<LLImageGL> image) : { } +LLUIImage::~LLUIImage() +{ +} + void LLUIImage::setClipRegion(const LLRectf& region) { mClipRegion = region; @@ -147,12 +151,16 @@ namespace LLInitParam return imagep; } + template<> bool ParamCompare<LLUIImage*>::equals( LLUIImage* const &a, LLUIImage* const &b) { // force all LLUIImages for XML UI export to be "non-default" - return false; + if (!a && !b) + return false; + else + return (a == b); } } |