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/lltoolmgr.h | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/lltoolmgr.h')
| -rw-r--r-- | indra/newview/lltoolmgr.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/lltoolmgr.h b/indra/newview/lltoolmgr.h index c1e144b252..73b8a38c57 100644 --- a/indra/newview/lltoolmgr.h +++ b/indra/newview/lltoolmgr.h @@ -45,7 +45,7 @@ const MASK MASK_ORBIT = MASK_CONTROL; const MASK MASK_PAN = MASK_CONTROL | MASK_SHIFT; const MASK MASK_COPY = MASK_SHIFT; -class LLToolMgr +class LLToolMgr : public LLSingleton<LLToolMgr> { public: LLToolMgr(); @@ -115,8 +115,7 @@ protected: void select_tool(void *tool); -// Globals (created and destroyed by LLViewerWindow) -extern LLToolMgr* gToolMgr; +// Globals extern LLToolset* gBasicToolset; extern LLToolset *gCameraToolset; |