From 98cc2365034a93c69704daa69efb389799cc9627 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 24 Aug 2010 18:44:39 +0100
Subject: Backed out changeset a62bf7c0af21

Backing out this merge that I pushed (prematurely) to the wrong place.
---
 indra/newview/llmediactrl.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'indra/newview/llmediactrl.h')

diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index 755d1e1b04..9fc066c07f 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -57,8 +57,6 @@ public:
 								texture_height;
 		
 		Optional<LLUIColor>		caret_color;
-
-		Optional<std::string>	initial_mime_type;
 		
 		Params();
 	};
@@ -105,7 +103,7 @@ public:
 		// because we control the page content.  See DEV-9530.  JC.
 		void setTrusted( bool valIn );
 
-		void setHomePageUrl( const std::string& urlIn, const std::string& mime_type = LLStringUtil::null );
+		void setHomePageUrl( const std::string urlIn );
 		std::string getHomePageUrl();
 
 		// set/clear URL to visit when a 404 page is reached
@@ -169,7 +167,6 @@ public:
 		bool mForceUpdate;
 		bool mTrusted;
 		std::string mHomePageUrl;
-		std::string mHomePageMimeType;
 		std::string mCurrentNavUrl;
 		bool mIgnoreUIScale;
 		bool mAlwaysRefresh;
-- 
cgit v1.2.3