Second Life viewer sources 1.21.0-RC

1 files changed, 4 insertions, 9 deletions

diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index feb1c74..ebabcae 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -86,12 +86,6 @@ public:
         /*virtual*/ void delayInputProcessing();
         /*virtual*/ void swapBuffers();
 
-        /*virtual*/ LLString getTempFileName();
-        /*virtual*/ void deleteFile( const char* file_name );
-        /*virtual*/ S32 stat( const char* file_name, struct stat* stat_info );
-        /*virtual*/ BOOL sendEmail(const char* address,const char* subject,const char* body_text,const char* attachment=NULL, const char* attachment_displayed_name=NULL);
-
-
         // handy coordinate space conversion routines
         /*virtual*/ BOOL convertCoords(LLCoordScreen from, LLCoordWindow *to);
         /*virtual*/ BOOL convertCoords(LLCoordWindow from, LLCoordScreen *to);
@@ -115,12 +109,13 @@ public:
         /*virtual*/ void setLanguageTextInput( const LLCoordGL & pos );
         /*virtual*/ void updateLanguageTextInputArea();
         /*virtual*/ void interruptLanguageTextInput();
+        /*virtual*/ void spawnWebBrowser(const std::string& escaped_url);
 
         static std::string getFontListSans();
 
 protected:
         LLWindowWin32(
-                char *title, char *name, int x, int y, int width, int height, U32 flags, 
+                const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags, 
                 BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl,
                 BOOL ignore_pixel_depth, U32 fsaa_samples);
         ~LLWindowWin32();
@@ -220,7 +215,7 @@ public:
         virtual ~LLSplashScreenWin32();
 
         /*virtual*/ void showImpl();
-        /*virtual*/ void updateImpl(const char* mesg);
+        /*virtual*/ void updateImpl(const std::string& mesg);
         /*virtual*/ void hideImpl();
 
 #if LL_WINDOWS
@@ -239,6 +234,6 @@ extern LPWSTR gIconResource;
 
 static void     handleMessage( const MSG& msg );
 
-S32 OSMessageBoxWin32(const char* text, const char* caption, U32 type);
+S32 OSMessageBoxWin32(const std::string& text, const std::string& caption, U32 type);
 
 #endif //LL_LLWINDOWWIN32_H