aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorelektrahesse2010-09-17 19:54:49 +0200
committerelektrahesse2010-09-17 19:54:49 +0200
commit88ff3a278918d915cd09b568f8a177c417809d39 (patch)
treee6cf3fa3963a0219370da2c27a52cba4cc529b06 /linden
parentAdded a check to avoid triggering completion tests if text in chatbar is empty. (diff)
downloadmeta-impy-88ff3a278918d915cd09b568f8a177c417809d39.zip
meta-impy-88ff3a278918d915cd09b568f8a177c417809d39.tar.gz
meta-impy-88ff3a278918d915cd09b568f8a177c417809d39.tar.bz2
meta-impy-88ff3a278918d915cd09b568f8a177c417809d39.tar.xz
Fixed path separators for im history so it's multiplatform now
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/llimpanel.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 797e997..3080a9e 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1875,7 +1875,14 @@ void LLFloaterIMPanel::onCommitCombo(LLUICtrl* caller, void* userdata)
1875 std::string fullname = self->getTitle(); 1875 std::string fullname = self->getTitle();
1876 //gCacheName->getFullName(self->mOtherParticipantUUID, fullname); 1876 //gCacheName->getFullName(self->mOtherParticipantUUID, fullname);
1877 //if(fullname == "(Loading...)") 1877 //if(fullname == "(Loading...)")
1878 std::string file = gDirUtilp->getPerAccountChatLogsDir() + "\\" + fullname + ".txt"; 1878 std::string separator;
1879#ifdef LL_WINDOWS
1880 separator = "\\";
1881#else
1882 separator = "/";
1883#endif
1884 std::string file = gDirUtilp->getPerAccountChatLogsDir() + separator + fullname + ".txt";
1885 llinfos << "File is: '" << file << "'" << llendl;
1879 1886
1880 llstat stat_info; 1887 llstat stat_info;
1881 if (LLFile::stat(file.c_str(), &stat_info)) 1888 if (LLFile::stat(file.c_str(), &stat_info))