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/lltoolpie.h | |
parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/lltoolpie.h')
-rw-r--r-- | indra/newview/lltoolpie.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index 1af4b26a94..4963940840 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -38,8 +38,7 @@ class LLViewerObject; class LLObjectSelection; -class LLToolPie -: public LLTool +class LLToolPie : public LLTool, public LLSingleton<LLToolPie> { public: LLToolPie( ); @@ -81,6 +80,5 @@ protected: static LLSafeHandle<LLObjectSelection> sLeftClickSelection; }; -extern LLToolPie *gToolPie; #endif |