From 73bc0fb42b5bcd80030d9f30d5cb57ec2397ba08 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Sat, 17 Feb 2007 03:02:16 +0000
Subject: merge -r 56779:58057 /branches/selection_management

---
 indra/newview/lltool.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

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

diff --git a/indra/newview/lltool.cpp b/indra/newview/lltool.cpp
index f9ff070289..1053e4a569 100644
--- a/indra/newview/lltool.cpp
+++ b/indra/newview/lltool.cpp
@@ -16,6 +16,7 @@
 
 #include "llviewerwindow.h"
 #include "lltoolcomp.h"
+#include "lltoolfocus.h"
 #include "llfocusmgr.h"
 #include "llagent.h"
 #include "llviewborder.h"
@@ -135,6 +136,14 @@ BOOL LLTool::handleKey(KEY key, MASK mask)
 	return FALSE;
 }
 
+LLTool* LLTool::getOverrideTool(MASK mask)
+{
+	if (mask & MASK_ALT)
+	{
+		return gToolCamera;
+	}
+	return NULL;
+}
 
 // static
 void	LLTool::onMouseCaptureLost( LLMouseHandler* old_captor )
-- 
cgit v1.2.3