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/lltoolselect.h | |
parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/lltoolselect.h')
-rw-r--r-- | indra/newview/lltoolselect.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lltoolselect.h b/indra/newview/lltoolselect.h index cc9168f7cc..c3d10424b1 100644 --- a/indra/newview/lltoolselect.h +++ b/indra/newview/lltoolselect.h @@ -38,7 +38,7 @@ class LLObjectSelection; -class LLToolSelect : public LLTool +class LLToolSelect : public LLTool, public LLSingleton<LLToolSelect> { public: LLToolSelect( LLToolComposite* composite ); @@ -59,6 +59,5 @@ protected: LLUUID mSelectObjectID; }; -extern LLToolSelect *gToolSelect; #endif // LL_TOOLSELECTION_H |