diff options
Diffstat (limited to 'linden/indra/newview/llimpanel.cpp')
-rw-r--r-- | linden/indra/newview/llimpanel.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp index 808a2c9..d9e822f 100644 --- a/linden/indra/newview/llimpanel.cpp +++ b/linden/indra/newview/llimpanel.cpp | |||
@@ -79,6 +79,10 @@ | |||
79 | #include "llstylemap.h" | 79 | #include "llstylemap.h" |
80 | #include <sys/stat.h> | 80 | #include <sys/stat.h> |
81 | 81 | ||
82 | // [RLVa:KB] | ||
83 | #include "rlvhandler.h" | ||
84 | // [/RLVa:KB] | ||
85 | |||
82 | // | 86 | // |
83 | // Constants | 87 | // Constants |
84 | // | 88 | // |
@@ -2115,18 +2119,18 @@ void LLFloaterIMPanel::sendMsg() | |||
2115 | // Truncate and convert to UTF8 for transport | 2119 | // Truncate and convert to UTF8 for transport |
2116 | utf8_text = utf8str_truncate(utf8_text, MAX_MSG_BUF_SIZE - 1); | 2120 | utf8_text = utf8str_truncate(utf8_text, MAX_MSG_BUF_SIZE - 1); |
2117 | 2121 | ||
2118 | // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-1.0.0g | 2122 | // [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-1.0.0g |
2119 | if (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM)) | 2123 | if (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM)) |
2120 | { | 2124 | { |
2121 | if (IM_NOTHING_SPECIAL == mDialog) // One-on-one IM: allow if recipient is a sendim exception | 2125 | if (IM_NOTHING_SPECIAL == mDialog) // One-on-one IM: allow if recipient is a sendim exception |
2122 | { | 2126 | { |
2123 | if (!gRlvHandler.isException(RLV_BHVR_SENDIM, mOtherParticipantUUID)) | 2127 | if (!gRlvHandler.isException(RLV_BHVR_SENDIM, mOtherParticipantUUID)) |
2124 | utf8_text = rlv_handler_t::cstrBlockedSendIM; | 2128 | utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM); |
2125 | } | 2129 | } |
2126 | else if (gAgent.isInGroup(mSessionUUID)) // Group chat: allow if recipient is a sendim exception | 2130 | else if (gAgent.isInGroup(mSessionUUID)) // Group chat: allow if recipient is a sendim exception |
2127 | { | 2131 | { |
2128 | if (!gRlvHandler.isException(RLV_BHVR_SENDIM, mSessionUUID)) | 2132 | if (!gRlvHandler.isException(RLV_BHVR_SENDIM, mSessionUUID)) |
2129 | utf8_text = rlv_handler_t::cstrBlockedSendIM; | 2133 | utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM); |
2130 | } | 2134 | } |
2131 | else if (mSpeakers) // Conference chat: allow if all participants are sendim exceptions | 2135 | else if (mSpeakers) // Conference chat: allow if all participants are sendim exceptions |
2132 | { | 2136 | { |
@@ -2139,14 +2143,14 @@ void LLFloaterIMPanel::sendMsg() | |||
2139 | LLSpeaker* pSpeaker = *itSpeaker; | 2143 | LLSpeaker* pSpeaker = *itSpeaker; |
2140 | if ( (gAgent.getID() != pSpeaker->mID) && (!gRlvHandler.isException(RLV_BHVR_SENDIM, pSpeaker->mID)) ) | 2144 | if ( (gAgent.getID() != pSpeaker->mID) && (!gRlvHandler.isException(RLV_BHVR_SENDIM, pSpeaker->mID)) ) |
2141 | { | 2145 | { |
2142 | utf8_text = rlv_handler_t::cstrBlockedSendIM; | 2146 | utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM); |
2143 | break; | 2147 | break; |
2144 | } | 2148 | } |
2145 | } | 2149 | } |
2146 | } | 2150 | } |
2147 | else // Catch all fall-through | 2151 | else // Catch all fall-through |
2148 | { | 2152 | { |
2149 | utf8_text = rlv_handler_t::cstrBlockedSendIM; | 2153 | utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM); |
2150 | } | 2154 | } |
2151 | } | 2155 | } |
2152 | // [/RLVa:KB] | 2156 | // [/RLVa:KB] |