diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-12-09 14:53:12 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-12-09 14:53:12 -0500 |
commit | f7215a5d7cb4f6431bbd63c42617b0a3dd207ac3 (patch) | |
tree | 0d84524f0269a6b982db3376658df19a9eebf7c1 /indra/llui/lluiimage.h | |
parent | 96d5f52624d68768592893ee0b27a0589b0f6222 (diff) | |
parent | 2c0cea901712ffad012356278d72e3c3d844e5bc (diff) |
automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/llui/lluiimage.h')
-rw-r--r-- | indra/llui/lluiimage.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llui/lluiimage.h b/indra/llui/lluiimage.h index 9d734bcfdf..5fa9610ab2 100644 --- a/indra/llui/lluiimage.h +++ b/indra/llui/lluiimage.h @@ -39,6 +39,7 @@ #include "llrefcount.h" #include "llrect.h" #include <boost/function.hpp> +#include <boost/signals2.hpp> #include "llinitparam.h" #include "lltexture.h" @@ -47,6 +48,8 @@ extern const LLColor4 UI_VERTEX_COLOR; class LLUIImage : public LLRefCount { public: + typedef boost::signals2::signal<void (void)> image_loaded_signal_t; + LLUIImage(const std::string& name, LLPointer<LLTexture> image); virtual ~LLUIImage(); @@ -77,7 +80,13 @@ public: S32 getTextureWidth() const; S32 getTextureHeight() const; + boost::signals2::connection addLoadedCallback( const image_loaded_signal_t::slot_type& cb ); + + void onImageLoaded(); + protected: + image_loaded_signal_t* mImageLoaded; + std::string mName; LLRectf mScaleRegion; LLRectf mClipRegion; |