Second Life viewer sources 1.21.0-RC

1 files changed, 13 insertions, 7 deletions

diff --git a/linden/indra/llwindow/llwindow.cpp b/linden/indra/llwindow/llwindow.cpp
index ffb6393..890143d 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -58,13 +58,13 @@ BOOL gDebugClicks = FALSE;
 BOOL gDebugWindowProc = FALSE;
 
 const S32 gURLProtocolWhitelistCount = 3;
-const char* gURLProtocolWhitelist[] = { "file", "http", "https" };
+const std::string gURLProtocolWhitelist[] = { "file:", "http:", "https:" };
 
 // CP: added a handler list - this is what's used to open the protocol and is based on registry entry
 //         only meaningful difference currently is that file: protocols are opened using http:
 //         since no protocol handler exists in registry for file:
 //     Important - these lists should match - protocol to handler
-const char* gURLProtocolWhitelistHandler[] = { "http", "http", "https" };       
+const std::string gURLProtocolWhitelistHandler[] = { "http", "http", "https" }; 
 
 BOOL LLWindowCallbacks::handleTranslatedKeyDown(const KEY key, const MASK mask, BOOL repeated)
 {
@@ -203,7 +203,7 @@ BOOL LLWindowCallbacks::handleDeviceChange(LLWindow *window)
         return FALSE;
 }
 
-S32 OSMessageBox(const char* text, const char* caption, U32 type)
+S32 OSMessageBox(const std::string& text, const std::string& caption, U32 type)
 {
         // Properly hide the splash screen when displaying the message box
         BOOL was_visible = FALSE;
@@ -285,6 +285,12 @@ void LLWindow::setCallbacks(LLWindowCallbacks *callbacks)
         }
 }
 
+void *LLWindow::getMediaWindow()
+{
+        // Default to returning the platform window.
+        return getPlatformWindow();
+}
+
 // static
 std::string LLWindow::getFontListSans()
 {
@@ -389,7 +395,7 @@ void LLSplashScreen::show()
 }
 
 //static
-void LLSplashScreen::update(const char* str)
+void LLSplashScreen::update(const std::string& str)
 {
         LLSplashScreen::show();
         if (gSplashScreenp)
@@ -417,8 +423,8 @@ void LLSplashScreen::hide()
 static std::set<LLWindow*> sWindowList;
 
 LLWindow* LLWindowManager::createWindow(
-        char *title,
-        char *name,
+        const std::string& title,
+        const std::string& name,
         LLCoordScreen upper_left,
         LLCoordScreen size,
         U32 flags,
@@ -434,7 +440,7 @@ LLWindow* LLWindowManager::createWindow(
 }
 
 LLWindow* LLWindowManager::createWindow(
-        char *title, char *name, S32 x, S32 y, S32 width, S32 height, U32 flags,
+        const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height, U32 flags,
         BOOL fullscreen, 
         BOOL clearBg,
         BOOL disable_vsync,