diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-20 19:24:07 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-20 19:24:07 +0200 |
| commit | d0c1593d85cd26ad822d31e21df7a1864d66541c (patch) | |
| tree | 30ceb3cfc19ccb36b7bcc7f0e5a2ad3efdd38747 /indra/newview/llimview.cpp | |
| parent | 9d64bf132e27739dedeca17a1d952655c6b52ac3 (diff) | |
| parent | 0c468557b9e38ec4be201fa991499ed095a4d8c3 (diff) | |
Merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index b509fe4043..c066f1f77a 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -395,21 +395,15 @@ bool LLIMModel::addToHistory(const LLUUID& session_id, const std::string& from, bool LLIMModel::logToFile(const LLUUID& session_id, const std::string& from, const LLUUID& from_id, const std::string& utf8_text) { - S32 im_log_option = gSavedPerAccountSettings.getS32("IMLogOptions"); - if (im_log_option != LOG_CHAT) + if (gSavedPerAccountSettings.getBOOL("LogInstantMessages")) { - if(im_log_option == LOG_BOTH_TOGETHER) - { - LLLogChat::saveHistory(std::string("chat"), from, from_id, utf8_text); - return true; - } - else - { - LLLogChat::saveHistory(LLIMModel::getInstance()->getName(session_id), from, from_id, utf8_text); - return true; - } + LLLogChat::saveHistory(LLIMModel::getInstance()->getName(session_id), from, from_id, utf8_text); + return true; + } + else + { + return false; } - return false; } bool LLIMModel::proccessOnlineOfflineNotification( @@ -1100,7 +1094,7 @@ LLOutgoingCallDialog::LLOutgoingCallDialog(const LLSD& payload) : void LLOutgoingCallDialog::getAllowedRect(LLRect& rect) { - rect = gViewerWindow->getWorldViewRectRaw(); + rect = gViewerWindow->getWorldViewRectScaled(); } void LLOutgoingCallDialog::onOpen(const LLSD& key) @@ -1213,7 +1207,7 @@ BOOL LLIncomingCallDialog::postBuild() void LLIncomingCallDialog::getAllowedRect(LLRect& rect) { - rect = gViewerWindow->getWorldViewRectRaw(); + rect = gViewerWindow->getWorldViewRectScaled(); } void LLIncomingCallDialog::onOpen(const LLSD& key) |