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, 18 insertions, 3 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 4683df1..402afdb 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -199,6 +199,10 @@
 #include <Security/Security.h>
 #endif
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 #if LL_WINDOWS
 #include "llwindebug.h"
 #include "lldxhardware.h"
@@ -2440,6 +2444,14 @@ bool idle_startup()
                         LLInventoryView::toggleVisibility(NULL);
                 }
 
+// [RLVa:KB] - Checked: 2009-11-27 (RLVa-1.1.0f) | Added: RLVa-1.1.0f
+                if (rlv_handler_t::isEnabled())
+                {
+                        // Regularly process a select subset of retained commands during logon
+                        gIdleCallbacks.addFunction(RlvHandler::onIdleStartup, new LLTimer());
+                }
+// [/RLVa:KB]
+
                 LLStartUp::setStartupState( STATE_MISC );
                 return FALSE;
         }
@@ -2787,8 +2799,11 @@ bool idle_startup()
                 // Have the agent start watching the friends list so we can update proxies
                 gAgent.observeFriends();
 
-                // Start loading inventory
-                gInventory.startBackgroundFetch();
+                if (gSavedSettings.getBOOL("FetchInventoryOnLogin"))
+                {
+                        // Start loading inventory
+                        gInventory.startBackgroundFetch();
+                }
 
                 if (gSavedSettings.getBOOL("LoginAsGod"))
                 {
@@ -2839,7 +2854,7 @@ bool idle_startup()
                 // reset keyboard focus to sane state of pointing at world
                 gFocusMgr.setKeyboardFocus(NULL);
 
-// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
                 // RELEASE-RLVa: this should go in LLAppViewer::handleLoginComplete() but Imprudence doesn't call that function
                 gRlvHandler.initLookupTables();