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.h | |
| parent | dc3833f31b8a20220ddb1775e1625c016c397435 (diff) | |
| parent | fcaa1ad46fd1df4cfec9dee12caf6e7b5bf32136 (diff) | |
Merge with viewer-2.0.0-3 branch
Diffstat (limited to 'indra/llui/lluiimage.h')
| -rw-r--r-- | indra/llui/lluiimage.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llui/lluiimage.h b/indra/llui/lluiimage.h index ae43b50172..e35026cd3d 100644 --- a/indra/llui/lluiimage.h +++ b/indra/llui/lluiimage.h @@ -33,7 +33,7 @@ #ifndef LL_LLUIIMAGE_H #define LL_LLUIIMAGE_H -#include "llgl.h" +//#include "llgl.h" #include "llimagegl.h" #include "llrefcount.h" #include "llrect.h" @@ -46,6 +46,7 @@ class LLUIImage : public LLRefCount { public: LLUIImage(const std::string& name, LLPointer<LLImageGL> image); + virtual ~LLUIImage(); void setClipRegion(const LLRectf& region); void setScaleRegion(const LLRectf& region); @@ -67,8 +68,8 @@ public: const std::string& getName() const { return mName; } - S32 getWidth() const; - S32 getHeight() const; + virtual S32 getWidth() const; + virtual S32 getHeight() const; // returns dimensions of underlying textures, which might not be equal to ui image portion S32 getTextureWidth() const; |