RED-595: Manual merge with weekly-webkit.

Plus some white space fixes (TABs --> spaces) in install.xml.

2 files changed, 3 insertions, 2 deletions

diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 2e96294..5e93ab3 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -196,7 +196,7 @@ public:
 // return a platform-specific window reference (HWND on Windows, WindowRef on the Mac, Gtk window on Linux)
         virtual void *getPlatformWindow() = 0;
 
-// return the platform-specific window reference we use to initialize llmozlib (HWND on Windows, WindowRef on the Mac, Gtk window on Linux)
+// return the platform-specific window reference we use to initialize llqtwebkitlib (HWND on Windows, WindowRef on the Mac, Gtk window on Linux)
         virtual void *getMediaWindow();
         
         // control platform's Language Text Input mechanisms.
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index fa53c84..16106af 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -1606,6 +1606,7 @@ void LLWindowSDL::processMiscNativeEvents()
             // the locale to protect it, as exotic/non-C locales
             // causes our code lots of general critical weirdness
             // and crashness. (SL-35450)
+            // Note: It is unknown if this is still needed now that we use webkit.
             static std::string saved_locale;
             saved_locale = ll_safe_string(setlocale(LC_ALL, NULL));
 
@@ -2433,7 +2434,7 @@ void *LLWindowSDL::getPlatformWindow()
                 return rtnw;
         }
 #endif // LL_GTK && LL_LLMOZLIB_ENABLED
-        // Unixoid mozilla really needs GTK.
+        llassert(false);        // Do we even GET here at all? Note that LL_LLMOZLIB_ENABLED is never defined!
         return NULL;
 }