diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-02-25 04:20:08 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-02-25 04:20:08 -0800 |
| commit | c6929e42486dd6aa212dc523be4f3b65f431b016 (patch) | |
| tree | 2cb1e36aea10dd61b01e6278577c8a6b8d59d798 /indra/newview | |
| parent | 58208df2263f1c673354e82b10422002e9503fc2 (diff) | |
CHUI-788 (Saving preferences updates text in all open message panels in conversation floater to show as old messages) Fixed build error for mac/linux
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lllogchat.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/lllogchat.h | 6 |
2 files changed, 14 insertions, 1 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index b60e2aa44e..95b0e6b9d6 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -561,6 +561,15 @@ bool LLLogChat::moveTranscripts(const std::string originDirectory, } //static +bool LLLogChat::moveTranscripts(const std::string currentDirectory, + const std::string newDirectory, + std::vector<std::string>& listOfFilesToMove) +{ + std::vector<std::string> listOfFilesMoved; + return moveTranscripts(currentDirectory, newDirectory, listOfFilesToMove, listOfFilesMoved); +} + +//static void LLLogChat::deleteTranscripts() { std::vector<std::string> list_of_transcriptions; diff --git a/indra/newview/lllogchat.h b/indra/newview/lllogchat.h index b9aede0b29..244f1c8790 100644 --- a/indra/newview/lllogchat.h +++ b/indra/newview/lllogchat.h @@ -59,7 +59,11 @@ public: static bool moveTranscripts(const std::string currentDirectory, const std::string newDirectory, std::vector<std::string>& listOfFilesToMove, - std::vector<std::string>& listOfFilesMoved = std::vector<std::string>()); + std::vector<std::string>& listOfFilesMoved); + static bool moveTranscripts(const std::string currentDirectory, + const std::string newDirectory, + std::vector<std::string>& listOfFilesToMove); + static void deleteTranscripts(); private: |