diff options
| author | James Cook <james@lindenlab.com> | 2009-12-29 11:55:20 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-29 11:55:20 -0800 |
| commit | c2915a889987e64484c9794d55740e7f6ac8f9bd (patch) | |
| tree | e09a6050829fbc4b1f8fdae03f6c12742ba903ed /indra/newview/lltexturectrl.h | |
| parent | 1e9a5c21e5493ad3dabec4d032bc0a627e2f725f (diff) | |
| parent | 3519435bbfeec4c838d5ffbe008d0ac7bbc085a8 (diff) | |
Merge viewer-2-0 into gooey
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; |