Merge remote branch 'elektra/weekly' into weekly

2 files changed, 10 insertions, 3 deletions

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))