From 941cb9f4124c9ccfd5c845bc94639fa46df12c3d Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Tue, 1 Apr 2008 17:45:04 +0000
Subject: merge release@83343 skinning-1-merge@83714 -> release QAR-424

---
 indra/newview/lltoolmgr.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/newview/lltoolmgr.h')

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;
-- 
cgit v1.2.3