Updated to SL source 1.21.2.

Conflicts:
	linden/indra/SConstruct
	linden/indra/newview/files.lst
	linden/indra/newview/llfloatertools.cpp
	linden/indra/newview/llfloatertools.h
	linden/indra/newview/lloverlaybar.cpp
	linden/indra/newview/lloverlaybar.h
	linden/indra/newview/llviewermenu.cpp
	linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
	linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
	linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
	linden/indra/newview/viewer_manifest.py

1 files changed, 18 insertions, 0 deletions

diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index d0aad25..1087fd8 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -50,6 +50,7 @@
 #include "llui.h"
 #include "llviewercontrol.h"
 #include "llviewerimagelist.h"
+#include "llviewerjoystick.h"
 #include "llviewermedia.h"
 #include "llviewermenu.h"       // handle_reset_view()
 #include "llviewermedia.h"
@@ -120,6 +121,7 @@ BOOL LLOverlayBar::postBuild()
 {
         childSetAction("IM Received",onClickIMReceived,this);
         childSetAction("Set Not Busy",onClickSetNotBusy,this);
+        childSetAction("Flycam",onClickFlycam,this);
         childSetAction("Mouselook",onClickMouselook,this);
         childSetAction("Stand Up",onClickStandUp,this);
         childSetVisible("chat_bar", gSavedSettings.getBOOL("ChatVisible"));
@@ -209,6 +211,16 @@ void LLOverlayBar::refresh()
                 buttons_changed = TRUE;
         }
 
+        BOOL flycam = LLViewerJoystick::getInstance()->getOverrideCamera();
+        button = getChild<LLButton>("Flycam");
+        if (button && button->getVisible() != flycam)
+        {
+                button->setVisible(flycam);
+                sendChildToFront(button);
+                moveChildToBackOfTabGroup(button);
+                buttons_changed = TRUE;
+        }               
+
         BOOL mouselook_grabbed;
         mouselook_grabbed = gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_DOWN_INDEX)
                 || gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_UP_INDEX);
@@ -284,6 +296,12 @@ void LLOverlayBar::onClickSetNotBusy(void*)
 
 
 // static
+void LLOverlayBar::onClickFlycam(void*)
+{
+        LLViewerJoystick::getInstance()->toggleFlycam();
+}
+
+// static
 void LLOverlayBar::onClickResetView(void* data)
 {
         handle_reset_view();