summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2013-07-16 14:56:25 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2013-07-16 14:56:25 +0300
commit170e01e7eb0f3785491d567b5734e8d493ecce22 (patch)
treef269fc92455180c5f58067d06d5cf7ab162ecc0f /indra/newview
parentae01baa0567a5e0c3f9c63936bd939cd7dc4f45d (diff)
CHUI-978 FIXED Add Nearby chat history to the list of transcriptions if it exists(to enable "Chat history" menu item for Nearby chat)
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/lllogchat.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index afaec48e7b..90b169ecd3 100755
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -470,6 +470,13 @@ void LLLogChat::findTranscriptFiles(std::string pattern, std::vector<std::string
LLFILE * filep = LLFile::fopen(fullname, "rb");
if (NULL != filep)
{
+ if(makeLogFileName("chat")== fullname)
+ {
+ //Add Nearby chat history to the list of transcriptions
+ list_of_transcriptions.push_back(gDirUtilp->add(dirname, filename));
+ LLFile::close(filep);
+ return;
+ }
char buffer[LOG_RECALL_SIZE];
fseek(filep, 0, SEEK_END); // seek to end of file