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

diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index a8b7106..2a8c20f 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -81,7 +81,7 @@
 
 #include "llglheaders.h"
 
-// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
+// [RLVa:KB]
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
@@ -739,7 +739,7 @@ void LLPanelLogin::refreshLocation( bool force_visible )
         if ( ! force_visible )
                 show_start = gSavedSettings.getBOOL("ShowStartLocation");
 
-// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
         // TODO-RLVa: figure out some way to make this work with RLV_EXTENSION_STARTLOCATION
         #ifndef RLV_EXTENSION_STARTLOCATION
                 if (rlv_handler_t::isEnabled())