From 190bd7d2b622efda788a7b1e7da5996c5095de54 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 27 Oct 2010 02:56:22 -0700
Subject: Load mime_types_windows.xml instead of mime_types.xml so we can
 fallback on the version in the skins directory correctly

---
 linden/indra/newview/CMakeLists.txt  | 4 ++--
 linden/indra/newview/llappviewer.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index bec20d9..6596d39 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1584,8 +1584,8 @@ if (WINDOWS)
 	 -E
 	 copy_if_different
 	 ${mime_types_source}/mime_types_windows.xml 
-	 ${mime_types_dest}/mime_types.xml
-      COMMENT "Copying mime_types_windows.xml to mime_types.xml."
+	 ${mime_types_dest}/mime_types_windows.xml
+      COMMENT "Copying mime_types_windows.xml to the runtime app_settings folder."
       )
   
 endif (WINDOWS)
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 5b34e82..97deca0 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -724,7 +724,7 @@ bool LLAppViewer::init()
 #elif LL_LINUX
 	mime_types_name = "mime_types_linux.xml";
 #else
-	mime_types_name = "mime_types.xml";
+	mime_types_name = "mime_types_windows.xml";
 #endif
 	LLMIMETypes::parseMIMETypes( mime_types_name ); 
 
-- 
cgit v1.1