Add RAII class for adding/erasing script entries; code clean up

2 files changed, 2 insertions, 4 deletions

diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index e3ef28a27d..7fbc2c8ea2 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -3757,9 +3757,7 @@ S32 OSMessageBoxWin32(const std::string& text, const std::string& caption, U32 t
 
 void shell_open(const std::string &file, bool async)
 {
-    // this is madness.. no, this is..
-    LLWString     url_wstring = utf8str_to_wstring(file);
-    llutf16string url_utf16 = wstring_to_utf16str(url_wstring);
+    std::wstring url_utf16 = ll_convert(file);
 
     // let the OS decide what to use to open the URL
     SHELLEXECUTEINFO sei = {sizeof(sei)};
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
index ed64891108..320c1c8b88 100644
--- a/indra/llwindow/llwindowwin32.h
+++ b/indra/llwindow/llwindowwin32.h
@@ -122,7 +122,7 @@ public:
 	/*virtual*/ void interruptLanguageTextInput();
 	/*virtual*/ void spawnWebBrowser(const std::string& escaped_url, bool async);
 
-    void openFolder(const std::string &path);
+    void openFolder(const std::string &path) override;
 
 	/*virtual*/ F32 getSystemUISize();