diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-02-27 14:48:39 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-02-27 14:48:39 -0500 |
commit | 063edac43f90d2cb0d2b41db939bbf919a1a3217 (patch) | |
tree | bbf1d446baef80933f6be80d05734d68144ae4cc /indra/llui/llpanel.h | |
parent | 6f53796ccf4dc29368920a322baeaceb3fd2266f (diff) | |
parent | e7ab3da7a7f5c68e3544a64c30f011762572995a (diff) |
Automated merge with file:///Users/nat/linden/viewer-leap-daggy
Diffstat (limited to 'indra/llui/llpanel.h')
-rw-r--r-- | indra/llui/llpanel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index cd33938226..f620201020 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -135,6 +135,8 @@ public: const LLColor4& getBackgroundColor() const { return mBgOpaqueColor; } void setTransparentColor(const LLColor4& color) { mBgAlphaColor = color; } const LLColor4& getTransparentColor() const { return mBgAlphaColor; } + void setBackgroundImage(LLUIImage* image) { mBgOpaqueImage = image; } + void setTransparentImage(LLUIImage* image) { mBgAlphaImage = image; } LLPointer<LLUIImage> getBackgroundImage() const { return mBgOpaqueImage; } LLPointer<LLUIImage> getTransparentImage() const { return mBgAlphaImage; } LLColor4 getBackgroundImageOverlay() { return mBgOpaqueImageOverlay; } |