Applied show IM logs button from Emerald viewer and added an alert if there is no history

3 files changed, 14 insertions, 0 deletions

diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 0acbcb9..0004e92 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -202,6 +202,7 @@ public:
         virtual void updateLanguageTextInputArea() {}
         virtual void interruptLanguageTextInput() {}
         virtual void spawnWebBrowser(const std::string& escaped_url) {};
+        virtual void ShellEx(const std::string& command) {};
 
         static std::string getFontListSans();
 
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 2944511..a9c7758 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -2885,6 +2885,18 @@ S32 OSMessageBoxWin32(const std::string& text, const std::string& caption, U32 t
         return retval;
 }
 
+void LLWindowWin32::ShellEx(const std::string& command )
+{
+        LLWString url_wstring = utf8str_to_wstring( command );
+        llutf16string url_utf16 = wstring_to_utf16str( url_wstring );
+
+        SHELLEXECUTEINFO sei = { sizeof( sei ) };
+        sei.fMask = SEE_MASK_FLAG_DDEWAIT;
+        sei.nShow = SW_SHOWNORMAL;
+        sei.lpVerb = L"open";
+        sei.lpFile = url_utf16.c_str();
+        ShellExecuteEx( &sei );
+}
 
 void LLWindowWin32::spawnWebBrowser(const std::string& escaped_url )
 {
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index 795fc79..bea55c6 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -110,6 +110,7 @@ public:
         /*virtual*/ void updateLanguageTextInputArea();
         /*virtual*/ void interruptLanguageTextInput();
         /*virtual*/ void spawnWebBrowser(const std::string& escaped_url);
+        /*virtual*/ void ShellEx(const std::string& command);
 
         static std::string getFontListSans();