From fe9719e8047e288bfb97068b7addd5dc50ffa739 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 21 Oct 2009 03:39:04 +0000
Subject: Merging revisions 2094-2099 of
 https://svn.aws.productengine.com/secondlife/pe/stable-2 into
 P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-1612 EXT-1604 EXT-1163
 EXT-1163 EXT-1167 * Dev: EXT-1516

---
 indra/newview/llfloatercamera.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index db20b11efd..551853592b 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -125,6 +125,12 @@ void LLFloaterCamera::onOpen(const LLSD& key)
 
 }
 
+void LLFloaterCamera::onClose(bool app_quitting)
+{
+	//We don't care of camera mode if app is quitting
+	if(!app_quitting)
+		switchMode(CAMERA_CTRL_MODE_ORBIT);
+}
 
 LLFloaterCamera::LLFloaterCamera(const LLSD& val)
 :	LLDockableFloater(NULL, val),
-- 
cgit v1.2.3