From f0dd8c460362c78e4d17be16c153ad618d4dd60e Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Mon, 5 Oct 2009 18:15:43 -0700
Subject: Back out changes accidentally checked in with last commit

---
 indra/newview/app_settings/logcontrol.xml | 3 ---
 indra/newview/llmediadataclient.cpp       | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 85cb3cf1b4..0524834747 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -35,15 +35,12 @@
 						</array>
 					<key>classes</key>
 						<array>
-						<string>LLMediaDataClient</string>
 						</array>
 					<key>files</key>
 						<array>
 						</array>
 					<key>tags</key>
 						<array>
-						<string>LLMediaDataClient</string>
-						<string>MediaOnAPrim</string>
 						</array>
 				</map>
 			</array>
diff --git a/indra/newview/llmediadataclient.cpp b/indra/newview/llmediadataclient.cpp
index c356f55315..7ef26fd0e2 100644
--- a/indra/newview/llmediadataclient.cpp
+++ b/indra/newview/llmediadataclient.cpp
@@ -618,6 +618,6 @@ void LLObjectMediaNavigateClient::Responder::bounceBack()
     
     if (mep && impl)
     {
-        impl->navigateTo(mep->getCurrentURL(), "", false, true);
+//        impl->navigateTo(mep->getCurrentURL(), "", false, true);
     }
 }
-- 
cgit v1.2.3