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, 6 insertions, 2 deletions

diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index 7d6c9e6..52053f5 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -69,6 +69,10 @@
 #include "llviewerparcelmgr.h" // RezWithLandGroup
 #include "roles_constants.h" // Ele: Land Group Override
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 const LLVector3 DEFAULT_OBJECT_SCALE(0.5f, 0.5f, 0.5f);
 
 //static 
@@ -556,8 +560,8 @@ BOOL LLToolPlacer::placeObject(S32 x, S32 y, MASK mask)
 {
         BOOL added = TRUE;
         
-// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
-        if (gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+        if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) || (gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT))) )
         {
                 return TRUE; // Callers seem to expect a "did you handle it?" so we return TRUE rather than FALSE
         }