Merge branch 'weekly' into webkit_plugins

Conflicts:
	linden/indra/cmake/GStreamer.cmake

linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to
use system libs, so any improvements that have been made in weekly have
been invane.

	linden/indra/newview/llstartup.cpp

Trivial #include collision. One include added another removed. Fixed.

	linden/indra/newview/lltoolpie.cpp

Collision with RLV, pretty trivial. Fixed.

	linden/indra/newview/viewer_manifest.py

Trivial White space fix collision with commenting out of gstreamer libs. Fixed.

1 files changed, 9 insertions, 5 deletions

diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index cc7a35d..41727f2 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -79,6 +79,10 @@
 #include "llstylemap.h"
 #include <sys/stat.h>
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 //
 // Constants
 //
@@ -2115,18 +2119,18 @@ void LLFloaterIMPanel::sendMsg()
                         // Truncate and convert to UTF8 for transport
                         utf8_text = utf8str_truncate(utf8_text, MAX_MSG_BUF_SIZE - 1);
                         
-// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-1.0.0g
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-1.0.0g
                         if (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM))
                         {
                                 if (IM_NOTHING_SPECIAL == mDialog)                      // One-on-one IM: allow if recipient is a sendim exception
                                 {
                                         if (!gRlvHandler.isException(RLV_BHVR_SENDIM, mOtherParticipantUUID))
-                                                utf8_text = rlv_handler_t::cstrBlockedSendIM;
+                                                utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
                                 }
                                 else if (gAgent.isInGroup(mSessionUUID))        // Group chat: allow if recipient is a sendim exception
                                 {
                                         if (!gRlvHandler.isException(RLV_BHVR_SENDIM, mSessionUUID))
-                                                utf8_text = rlv_handler_t::cstrBlockedSendIM;
+                                                utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
                                 }
                                 else if (mSpeakers)                                                     // Conference chat: allow if all participants are sendim exceptions
                                 {
@@ -2139,14 +2143,14 @@ void LLFloaterIMPanel::sendMsg()
                                                 LLSpeaker* pSpeaker = *itSpeaker;
                                                 if ( (gAgent.getID() != pSpeaker->mID) && (!gRlvHandler.isException(RLV_BHVR_SENDIM, pSpeaker->mID)) )
                                                 {
-                                                        utf8_text = rlv_handler_t::cstrBlockedSendIM;
+                                                        utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
                                                         break;
                                                 }
                                         }
                                 }
                                 else                                                                            // Catch all fall-through
                                 {
-                                        utf8_text = rlv_handler_t::cstrBlockedSendIM;
+                                        utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
                                 }
                         }
 // [/RLVa:KB]