diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/lltoolgun.h | |
parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/lltoolgun.h')
-rw-r--r-- | indra/newview/lltoolgun.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/lltoolgun.h b/indra/newview/lltoolgun.h index 14cc502441..19b02a1214 100644 --- a/indra/newview/lltoolgun.h +++ b/indra/newview/lltoolgun.h @@ -33,7 +33,7 @@ #define LL_TOOLGUN_H #include "lltool.h" -#include "llviewerimage.h" +#include "llui.h" class LLToolGun : public LLTool @@ -51,9 +51,6 @@ public: virtual LLTool* getOverrideTool(MASK mask) { return NULL; } virtual BOOL clipMouseWhenDown() { return FALSE; } - -private: - LLPointer<LLViewerImage> mCrosshairImg; }; #endif |