diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-02-11 16:10:34 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-02-11 16:10:34 -0800 |
| commit | 2317591c93b5870acd6fdedbecc2d8050511459d (patch) | |
| tree | c79411f06b25eef8ec26e8bcf306e17787d7f121 /indra/newview/llconversationlog.cpp | |
| parent | 279d4a95ea84ddeb32efc54deb6923202fe638a7 (diff) | |
| parent | c4bcd4f2c2578e8f165361441635ef47f51ec420 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llconversationlog.cpp')
| -rw-r--r-- | indra/newview/llconversationlog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp index 82176b3a06..15d61e978d 100644 --- a/indra/newview/llconversationlog.cpp +++ b/indra/newview/llconversationlog.cpp @@ -276,7 +276,7 @@ void LLConversationLog::updateConversationName(const LLIMModel::LLIMSession* ses LLConversation* conversation = findConversation(session); if (conversation) { - conversation->setConverstionName(name); + conversation->setConversationName(name); notifyParticularConversationObservers(conversation->getSessionID(), LLConversationLogObserver::CHANGED_NAME); } } @@ -378,7 +378,7 @@ void LLConversationLog::cache() std::string LLConversationLog::getFileName() { std::string filename = "conversation"; - return gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, filename) + ".log"; + return gDirUtilp->getExpandedFilename(LL_PATH_PER_ACCOUNT_CHAT_LOGS, filename) + ".log"; } bool LLConversationLog::saveToFile(const std::string& filename) |