Merge remote branch 'elektra/weekly' into weekly

4 files changed, 40 insertions, 9 deletions

diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index 7e7e0af..7efba51 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -1153,16 +1153,15 @@ void LLWindowMacOSX::gatherInput()
                         }
                         break;
 
-                case kHighLevelEvent:
-                        AEProcessAppleEvent (&evt);
-                        break;
-
                 case updateEvt:
                         // We shouldn't be getting these regularly (since our window will be buffered), but we need to handle them correctly...
                         BeginUpdate((WindowRef)evt.message);
                         EndUpdate((WindowRef)evt.message);
                         break;
 
+                default:
+                        AEProcessAppleEvent (&evt);
+                        break;
                 }
         }
 }
@@ -3163,8 +3162,6 @@ void LLWindowMacOSX::spawnWebBrowser(const std::string& escaped_url)
         OSStatus result = noErr;
         CFURLRef urlRef = NULL;
 
-        llinfos << "Opening URL " << escaped_url << llendl;
-
         CFStringRef     stringRef = CFStringCreateWithCString(NULL, escaped_url.c_str(), kCFStringEncodingUTF8);
         if (stringRef)
         {
@@ -3194,6 +3191,32 @@ void LLWindowMacOSX::spawnWebBrowser(const std::string& escaped_url)
         }
 }
 
+void LLWindowMacOSX::ShellEx(const std::string& command)
+{
+        OSStatus result = noErr;
+        CFURLRef urlRef = NULL;
+
+        CFStringRef     stringRef = CFStringCreateWithCString(NULL, command.c_str(), kCFStringEncodingUTF8);
+        if (stringRef)
+        {
+                urlRef = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, stringRef, kCFURLPOSIXPathStyle, false);
+                CFRelease(stringRef);
+        }
+
+        if (urlRef)
+        {
+                result = LSOpenCFURLRef(urlRef, NULL);          
+                if (result != noErr)
+                        llinfos << "Error " << result << " on open." << llendl;
+
+                CFRelease(urlRef);
+        }
+        else
+        {
+                llinfos << "Error: couldn't create URL." << llendl;
+        }
+}
+
 BOOL LLWindowMacOSX::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
 {
         BOOL    retval = FALSE;
diff --git a/linden/indra/llwindow/llwindowmacosx.h b/linden/indra/llwindow/llwindowmacosx.h
index bf5bfc0..9e87e9f 100644
--- a/linden/indra/llwindow/llwindowmacosx.h
+++ b/linden/indra/llwindow/llwindowmacosx.h
@@ -113,6 +113,7 @@ public:
         /*virtual*/ void allowLanguageTextInput(LLPreeditor *preeditor, BOOL b);
         /*virtual*/ void interruptLanguageTextInput();
         /*virtual*/ void spawnWebBrowser(const std::string& escaped_url);
+        /*virtual*/ void ShellEx(const std::string& command);
 
         static std::vector<std::string> getDynamicFallbackFontList();
 
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 2981958..eaa8cc8 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -215,16 +215,17 @@ BOOL LLChatBar::handleKeyHere( KEY key, MASK mask )
         {
                 if (mInputEditor)
                 {
+                        std::string txt(mInputEditor->getText());
+
                         std::vector<LLUUID> avatar_ids;
                         std::vector<LLVector3d> positions;
                         LLWorld::getInstance()->getAvatars(&avatar_ids, &positions);
 
-                        if (!avatar_ids.empty())
+                        if (!avatar_ids.empty() && !txt.empty())
                         {
                                 mInputEditor->deleteSelection(); // Clean up prev completion before attempting a new one
 
                                 S32 cursorPos = mInputEditor->getCursor();
-                                std::string txt(mInputEditor->getText());
 
                                 if (mCompletionHolder.last_txt != mInputEditor->getText())
                                 {
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 797e997..808a2c9 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1875,7 +1875,13 @@ void LLFloaterIMPanel::onCommitCombo(LLUICtrl* caller, void* userdata)
                                 std::string fullname = self->getTitle();
                                 //gCacheName->getFullName(self->mOtherParticipantUUID, fullname);
                                 //if(fullname == "(Loading...)")
-                                std::string file = gDirUtilp->getPerAccountChatLogsDir() + "\\" + fullname + ".txt";
+                                std::string separator;
+#ifdef LL_WINDOWS
+                                separator = "\\";
+#else
+                                separator = "/";
+#endif
+                                std::string file = gDirUtilp->getPerAccountChatLogsDir() + separator + fullname + ".txt";
 
                                 llstat stat_info;
                                 if (LLFile::stat(file.c_str(), &stat_info))