summaryrefslogtreecommitdiff
path: root/indra/llui/lluiimage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llui/lluiimage.cpp')
-rw-r--r--indra/llui/lluiimage.cpp10
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);
}
}