From eb853f55c07ae4a3c3f2aa05fbabcf2e4b4dc115 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Tue, 4 Aug 2009 01:12:59 +0000
Subject: svn merge -r 128442:129343
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into
 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

---
 indra/newview/llfloatergodtools.cpp | 9 ---------
 1 file changed, 9 deletions(-)

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

diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index 6d603fa5c8..886f5ec924 100644
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -185,15 +185,6 @@ void LLFloaterGodTools::updatePopup(LLCoordGL center, MASK mask)
 {
 }
 
-// virtual
-void LLFloaterGodTools::onClose(bool app_quitting)
-{
-	LLFloaterGodTools* god_tools = LLFloaterReg::getTypedInstance<LLFloaterGodTools>("god_tools");
-	if(!god_tools) return;
-	god_tools->setVisible(FALSE);
-	
-}
-
 // virtual
 void LLFloaterGodTools::draw()
 {
-- 
cgit v1.3