diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-22 17:50:17 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-22 17:50:17 +0200 |
| commit | a68935b94fea5e07cd9ae2d9e697cf0a632e682d (patch) | |
| tree | ec2e05dc583ef547aef966bf6100f2a5c50e31b0 /indra/newview/lltexturectrl.h | |
| parent | 191e5f9ca033cd1520950f35309c0bc2c4499803 (diff) | |
| parent | 754801f66942b0e9ec5ab4278dacb034fd23a0dd (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltexturectrl.h')
| -rw-r--r-- | indra/newview/lltexturectrl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index 0b232da62b..fb1d591e32 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -45,7 +45,7 @@ class LLButton; class LLFloaterTexturePicker; class LLInventoryItem; -class LLViewerTexture; +class LLViewerFetchedTexture; // used for setting drag & drop callbacks. typedef boost::function<BOOL (LLUICtrl*, LLInventoryItem*)> drag_n_drop_callback; @@ -189,7 +189,7 @@ private: drag_n_drop_callback mDropCallback; commit_callback_t mOnCancelCallback; commit_callback_t mOnSelectCallback; - LLPointer<LLViewerTexture> mTexturep; + LLPointer<LLViewerFetchedTexture> mTexturep; LLUIColor mBorderColor; LLUUID mImageItemID; LLUUID mImageAssetID; |