diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 10:21:19 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 10:21:19 +0300 |
| commit | 6ce9daa13d87fadc03d9ccd819a3e9b3f8748d8d (patch) | |
| tree | aca982dba1eed0485bf7153165b30cd4774987aa /indra/newview/llimview.cpp | |
| parent | e8d33a8b5b06b70b6354672b6d426e82a8aed578 (diff) | |
| parent | 15908fd34e6d7a40f1d21e9f83676429818f2f06 (diff) | |
Merge commit '15908fd34e' into marchcat/c-develop
# Conflicts:
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/newview/llappviewer.cpp
# indra/newview/llconversationlog.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llimview.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llviewerjoystick.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 1402cc8c37..529deed511 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1690,6 +1690,8 @@ bool LLIMModel::logToFile(const std::string& file_name, const std::string& from, } else { + // will check KeepConversationLogTranscripts on its own + LLConversationLog::instance().cache(); return false; } } |