From 71d28bdbf0baab9302c8f458e3bdbcfc60d656d4 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 17 Jan 2007 23:02:00 +0000
Subject: merge release@56803 release-candidate@56833

---
 indra/newview/lltoolmgr.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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

diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp
index 99271e18c5..2c69db10c5 100644
--- a/indra/newview/lltoolmgr.cpp
+++ b/indra/newview/lltoolmgr.cpp
@@ -159,6 +159,12 @@ void LLToolMgr::initTools()
 	gToolGun = new LLToolCompGun();
 	gMouselookToolset->addTool( gToolGun );
 
+	//
+	// Inspect tool
+	//
+	gToolInspect = new LLToolCompInspect();
+	gBasicToolset->addTool( gToolInspect );
+
 	//
 	// Face edit tool
 	//
@@ -328,6 +334,12 @@ LLTool* LLToolMgr::getCurrentTool(MASK override_mask)
 		mOverrideTool = NULL;
 		return mCurrentTool;
 	}
+	else if (mCurrentTool == gToolInspect)
+	{
+		// ...can't switch out of grab
+		mOverrideTool = NULL;
+		return mCurrentTool;
+	}
 	else
 	{
 		// ...can switch between editing tools
-- 
cgit v1.2.3