1 files changed, 145 insertions, 20 deletions

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index cbcfb86..858137a 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -158,6 +158,10 @@
 #include "llwindebug.h" // For the invalid message handler
 #endif
 
+#if USE_OTR          // [$PLOTR$]
+#include "otr_wrapper.h"
+#endif // USE_OTR    // [/$PLOTR$]
+
 //silly spam define D:
 bool dialogSpamOn;
 static LLFrameTimer d_spam;
@@ -1278,7 +1282,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 
                 log_message = "You decline " + mDesc + " from " + mFromName + ".";
                 chat.mText = log_message;
-                if( LLMuteList::getInstance()->isMuted(mFromID ) && ! LLMuteList::getInstance()->isLinden(mFromName) )  // muting for SL-42269
+                if( LLMuteList::getInstance()->isMuted(mFromID ) && ! LLMuteList::getInstance()->isGod(mFromName) )  // muting for SL-42269
                 {
                         chat.mMuted = TRUE;
                 }
@@ -1566,12 +1570,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
         BOOL is_busy = gAgent.getBusy();
         BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat);
-        BOOL is_linden = LLMuteList::getInstance()->isLinden(name);
+        BOOL is_god = LLMuteList::getInstance()->isGod(name);
         BOOL is_owned_by_me = FALSE;
 
         LLUUID computed_session_id = LLIMMgr::computeSessionID(dialog,from_id);
         
-        chat.mMuted = is_muted && !is_linden;
+        chat.mMuted = is_muted && !is_god;
         chat.mFromID = from_id;
         chat.mFromName = name;
         chat.mSourceType = (from_id.isNull() || (name == std::string(SYSTEM_FROM))) ? CHAT_SOURCE_SYSTEM : CHAT_SOURCE_AGENT;
@@ -1582,14 +1586,135 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                 is_owned_by_me = source->permYouOwner();
         }
 
+#if USE_OTR // [$PLOTR$]
+        std::string decrypted_msg;
+        bool encrypted = false;
+//     if ((CHAT_SOURCE_SYSTEM == chat.mSourceType) &&
+//         ((std::string::npos != message.find("not online")) ||
+//          (std::string::npos != message.find("stored and delivered later"))))
+//     {
+//         llinfos << "$PLOTR$ Looks like " << from_id << " went offline." << llendl;
+//     }
+        U32 otrpref = gSavedSettings.getU32("EmeraldUseOTR");
+    // otrpref: 0 == Require use of OTR in IMs, 1 == Request OTR if available, 2 == Accept OTR requests, 3 == Decline use of OTR
+        if ((otrpref != 3) && !is_muted && (chat.mSourceType == CHAT_SOURCE_AGENT))
+        {
+                int ignore_message = 0;
+                char *newmessage = NULL;
+                OtrlTLV *tlvs = NULL;
+                char my_uuid[UUID_STR_SIZE];
+                char their_uuid[UUID_STR_SIZE];
+
+        if (gOTR &&
+            ((IM_NOTHING_SPECIAL == dialog) ||
+             ((IM_TYPING_STOP == dialog) &&
+              (! ((message == "typing") || (message == "cryo::ping"))))))
+                {
+                        // only try OTR for 1 on 1 IM's or special tagged typing_stop packets
+                        gAgent.getID().toString(&(my_uuid[0]));
+                        from_id.toString(&(their_uuid[0]));
+                        ignore_message = otrl_message_receiving(
+                                gOTR->get_userstate(), 
+                                gOTR->get_uistate(), 
+                                &session_id,
+                                my_uuid,
+                                gOTR->get_protocolid(),
+                                their_uuid,
+                                &(message[0]), &newmessage,
+                                &tlvs,
+                                NULL, NULL);
+                }
+                if (tlvs)
+                {
+                        llinfos << "$PLOTR$ recieved TLVs" << llendl;
+                        LLUUID session = LLIMMgr::computeSessionID(dialog,from_id);
+
+                        if(!otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED))
+                        {
+                                // currently the only TLVs we deal with are SMP, and they require an IM panel
+                                if(!gIMMgr->hasSession(session))
+                                {
+                                        gIMMgr->addSession(name,IM_NOTHING_SPECIAL,from_id);
+                                }
+                                                        
+                        }
+                        LLFloaterIMPanel* pan = gIMMgr->findFloaterBySession(session);
+                        if (pan) pan->handleOtrTlvs(tlvs);
+                        otrl_tlv_free(tlvs);
+                }
+                if (1 == ignore_message)
+                {
+            OtrlMessageType msgtype = otrl_proto_message_type(&(message[0]));
+            if (OTRL_MSGTYPE_NOTOTR == msgtype)
+            {
+                llinfos << "$PLOTR$ [not otr, but to be ignored (" << message << ")]" << llendl;
+                if ((0 == otrpref) && (IM_NOTHING_SPECIAL == dialog) && !is_muted)
+                {
+                    LLUUID session = LLIMMgr::computeSessionID(dialog,from_id);
+                    if(!gIMMgr->hasSession(session))
+                    {
+                        gIMMgr->addSession(name,IM_NOTHING_SPECIAL,from_id);
+                    }
+                    // NOT deliver_otr_message since those might go via typing_stop
+                    deliver_message(  // $TODO$ move the following message to some .xml file
+                        "/me's settings require OTR encrypted instant messages. Your message was not displayed.",
+                        session, from_id, IM_NOTHING_SPECIAL);
+                    LLFloaterIMPanel* pan = gIMMgr->findFloaterBySession(session);
+                    if(pan)pan->doOtrStart();
+                }
+            }
+            else
+            {
+                // an internal OTR protocol message was recieved, don't show anything to the user
+                llinfos << "$PLOTR$ [OTR PROTOCOL MESSAGE (" << message << ")]" << llendl;
+            }
+            otr_show_status(session_id);
+                        return;
+                }
+                if (newmessage)
+                {
+            // message was processed by OTR.  Maybe decrypted, maybe just stripping off the
+            // white-space "I have OTR" tag
+                        decrypted_msg = newmessage;  // use processed message
+                        message = newmessage;        // use processed message
+                        otrl_message_free(newmessage);
+                        ConnContext *context = otrl_context_find(
+                                gOTR->get_userstate(), 
+                                their_uuid,
+                                my_uuid,
+                                gOTR->get_protocolid(),
+                                0, NULL, NULL, NULL);
+                        encrypted = (context && (OTRL_MSGSTATE_ENCRYPTED == context->msgstate));
+            if (IM_TYPING_STOP == dialog)
+            {
+                if ("typing" == message) return; // don't display whitespace tagged "typing" stop messages
+                dialog = IM_NOTHING_SPECIAL;     // display messages received in typing_stop packets
+            }
+                }
+        }
+
+#endif // USE_OTR // [/$PLOTR$]
+
         std::string separator_string(": ");
         int message_offset = 0;
 
+#if USE_OTR // [$PLOTR$]
+        if(encrypted)
+        {
+                separator_string = "\xe2\x80\xa7: ";
+                message = decrypted_msg;
+        }
+#endif // USE_OTR // [/$PLOTR$]
+
                 //Handle IRC styled /me messages.
         std::string prefix = message.substr(0, 4);
         if (prefix == "/me " || prefix == "/me'")
         {
+#if USE_OTR // [$PLOTR$]
+                separator_string = encrypted ? "\xe2\x80\xa7" : "";
+#else
                 separator_string = "";
+#endif // USE_OTR // [/$PLOTR$]
                 message_offset = 3;
         }
 
@@ -1848,7 +1973,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         {
         case IM_CONSOLE_AND_CHAT_HISTORY:
                 // These are used for system messages, hence don't need the name,
-                // as it is always "Imprudence".
+                // as it is always "Imprudence".  Or "meta-impy" maybe?  shrugs
                 // *TODO:translate
                 args["MESSAGE"] = message;
 
@@ -1875,9 +2000,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         gIMMgr->processIMTypingStop(im_info);
                 }
 // [/RLVa:KB]
-//              else if (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM)
+//              else if (offline == IM_ONLINE && !is_god && is_busy && name != SYSTEM_FROM)
 // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
-                else if ( (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM) && 
+                else if ( (offline == IM_ONLINE && !is_god && is_busy && name != SYSTEM_FROM) && 
                               ( (!gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.isException(RLV_BHVR_RECVIM, from_id))) )
 // [/RLVa:KB]
                 {
@@ -1937,9 +2062,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                 else if (to_id.isNull())
                 {
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
-                        // Filter region messages that weren't sent by a Linden
+                        // Filter region messages that weren't sent by a god
                         if ( (rlv_handler_t::isEnabled()) && (LLMuteList::getInstance()) && 
-                                (!LLMuteList::getInstance()->isLinden(name)) && (from_id != gAgent.getID()) )
+                                (!LLMuteList::getInstance()->isGod(name)) && (from_id != gAgent.getID()) )
                         {
                                 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
                                         gRlvHandler.filterLocation(message);
@@ -1984,7 +2109,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
                         LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
 
-                        if (!is_muted || is_linden)
+                        if (!is_muted || is_god)
                         {
                                 gIMMgr->addMessage(
                                         session_id,
@@ -2130,7 +2255,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                 break;
         case IM_GROUP_INVITATION:
                 {
-                        //if (!is_linden && (is_busy || is_muted))
+                        //if (!is_god && (is_busy || is_muted))
                         if ((is_busy || is_muted))
                         {
                                 LLMessageSystem *msg = gMessageSystem;
@@ -2297,7 +2422,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         
         case IM_SESSION_SEND:
         {
-                if (!is_linden && is_busy)
+                if (!is_god && is_busy)
                 {
                         return;
                 }
@@ -2922,14 +3047,14 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
         BOOL is_busy = gAgent.getBusy();
 
         BOOL is_muted = FALSE;
-        BOOL is_linden = FALSE;
+        BOOL is_god = FALSE;
         is_muted = LLMuteList::getInstance()->isMuted(
                 from_id,
                 from_name,
                 LLMute::flagTextChat) 
                 || LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagTextChat);
-        is_linden = chat.mSourceType != CHAT_SOURCE_OBJECT &&
-                LLMuteList::getInstance()->isLinden(from_name);
+        is_god = chat.mSourceType != CHAT_SOURCE_OBJECT &&
+                LLMuteList::getInstance()->isGod(from_name);
 
         BOOL is_audible = (CHAT_AUDIBLE_FULLY == chat.mAudible);
         chatter = gObjectList.findObject(from_id);
@@ -2958,7 +3083,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
                 // record last audible utterance
                 if (is_audible
-                        && (is_linden || (!is_muted && !is_busy)))
+                        && (is_god || (!is_muted && !is_busy)))
                 {
                         if (chat.mChatType != CHAT_TYPE_START 
                                 && chat.mChatType != CHAT_TYPE_STOP)
@@ -3286,7 +3411,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 }
 
                 // truth table:
-                // LINDEN       BUSY    MUTED   OWNED_BY_YOU    TASK            DISPLAY         STORE IN HISTORY
+                // GOD          BUSY    MUTED   OWNED_BY_YOU    TASK            DISPLAY         STORE IN HISTORY
                 // F            F               F               F                               *                       Yes                     Yes
                 // F            F               F               T                               *                       Yes                     Yes
                 // F            F               T               F                               *                       No                      No
@@ -3297,11 +3422,11 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 // F            T               T               T                               *                       No                      No
                 // T            *               *               *                               F                       Yes                     Yes
 
-                chat.mMuted = is_muted && !is_linden;
+                chat.mMuted = is_muted && !is_god;
                 
                 
                 if (!visible_in_chat_bubble 
-                        && (is_linden || !is_busy || is_owned_by_me))
+                        && (is_god || !is_busy || is_owned_by_me))
                 {
                         // show on screen and add to history
                         check_translate_chat(mesg, chat, FALSE);
@@ -5295,7 +5420,7 @@ void process_alert_core(const std::string& message, BOOL modal)
         else if( message == "Home position set." )
         {
                 // save the home location image to disk
-                std::string snap_filename = gDirUtilp->getLindenUserDir();
+                std::string snap_filename = gDirUtilp->getViewerUserDir();
                 snap_filename += gDirUtilp->getDirDelimiter();
                 snap_filename += SCREEN_HOME_FILENAME;
                 gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight(), FALSE, FALSE);
@@ -6650,7 +6775,7 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
                 }
                 else
                 {
-                        covenant_text = "There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab.  Please contact the Estate Owner for sales details.";
+                        covenant_text = "There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not the grid owners.  Please contact the Estate Owner for sales details.";
                 }
                 LLPanelEstateCovenant::updateCovenantText(covenant_text, covenant_id);
                 LLPanelLandCovenant::updateCovenantText(covenant_text);