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/lltoolpipette.h | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/lltoolpipette.h')
| -rw-r--r-- | indra/newview/lltoolpipette.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h index 411cb465b9..ef4718bd62 100644 --- a/indra/newview/lltoolpipette.h +++ b/indra/newview/lltoolpipette.h @@ -43,7 +43,7 @@ class LLViewerObject; class LLToolPipette -: public LLTool +: public LLTool, public LLSingleton<LLToolPipette> { public: LLToolPipette(); @@ -68,6 +68,4 @@ protected: void* mUserData; }; -extern LLToolPipette *gToolPipette; - #endif //LL_LLTOOLPIPETTE_H |