diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/newview/lllogchat.cpp | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/lllogchat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/lllogchat.cpp b/linden/indra/newview/lllogchat.cpp index 030b357..ea686af 100644 --- a/linden/indra/newview/lllogchat.cpp +++ b/linden/indra/newview/lllogchat.cpp | |||
| @@ -112,7 +112,7 @@ void LLLogChat::loadHistory(std::string filename , void (*callback)(ELogLineType | |||
| 112 | LLFILE* fptr = LLFile::fopen(makeLogFileName(filename), "r"); /*Flawfinder: ignore*/ | 112 | LLFILE* fptr = LLFile::fopen(makeLogFileName(filename), "r"); /*Flawfinder: ignore*/ |
| 113 | if (!fptr) | 113 | if (!fptr) |
| 114 | { | 114 | { |
| 115 | //LLUIString message = LLFloaterChat::getInstance()->getUIString("IM_logging_string"); | 115 | //LLUIString message = LLFloaterChat::getInstance()->getString("IM_logging_string"); |
| 116 | //callback(LOG_EMPTY,"IM_logging_string",userdata); | 116 | //callback(LOG_EMPTY,"IM_logging_string",userdata); |
| 117 | callback(LOG_EMPTY,LLStringUtil::null,userdata); | 117 | callback(LOG_EMPTY,LLStringUtil::null,userdata); |
| 118 | return; //No previous conversation with this name. | 118 | return; //No previous conversation with this name. |