1 files changed, 35 insertions, 23 deletions

diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index eb8977c..f7713c2 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -54,7 +54,7 @@
 //
 
 // linden library includes
-#include "audioengine.h"                // mute on minimize
+#include "llaudioengine.h"              // mute on minimize
 #include "indra_constants.h"
 #include "llassetstorage.h"
 #include "llfontgl.h"
@@ -156,7 +156,6 @@
 #include "lltoolselectland.h"
 #include "lltoolview.h"
 #include "lluictrlfactory.h"
-#include "lluploaddialog.h"
 #include "llurldispatcher.h"            // SLURL from other app instance
 #include "llvieweraudio.h"
 #include "llviewercamera.h"
@@ -164,6 +163,8 @@
 #include "llviewerimagelist.h"
 #include "llviewerinventory.h"
 #include "llviewerkeyboard.h"
+#include "llviewermedia.h"
+#include "llviewermediafocus.h"
 #include "llviewermenu.h"
 #include "llviewermessage.h"
 #include "llviewerobjectlist.h"
@@ -310,7 +311,9 @@ public:
                                 S32 hours = (S32)(time / (60*60));
                                 S32 mins = (S32)((time - hours*(60*60)) / 60);
                                 S32 secs = (S32)((time - hours*(60*60) - mins*60));
-                                addText(xpos, ypos, llformat(" Debug %d: %d:%02d:%02d", idx, hours,mins,secs)); ypos += y_inc2;
+                                std::string label = gDebugTimerLabel[idx];
+                                if (label.empty()) label = llformat("Debug: %d", idx);
+                                addText(xpos, ypos, llformat(" %s: %d:%02d:%02d", label.c_str(), hours,mins,secs)); ypos += y_inc2;
                         }
                         
                         F32 time = gFrameTimeSeconds;
@@ -795,6 +798,7 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK
         if (handle)
                 return handle;
 
+
         // *HACK: this should be rolled into the composite tool logic, not
         // hardcoded at the top level.
         if (CAMERA_MODE_CUSTOMIZE_AVATAR != gAgent.getCameraMode() && LLToolMgr::getInstance()->getCurrentTool() != LLToolPie::getInstance())
@@ -1141,7 +1145,7 @@ void LLViewerWindow::handleDataCopy(LLWindow *window, S32 data_type, void *data)
         case SLURL_MESSAGE_TYPE:
                 // received URL
                 std::string url = (const char*)data;
-                LLWebBrowserCtrl* web = NULL;
+                LLMediaCtrl* web = NULL;
                 const bool trusted_browser = false;
                 if (LLURLDispatcher::dispatch(url, web, trusted_browser))
                 {
@@ -1736,6 +1740,19 @@ void LLViewerWindow::initWorldUI()
         // menu holder appears on top to get first pass at all mouse events
 
         mRootView->sendChildToFront(gMenuHolder);
+
+        if ( gHUDView == NULL )
+        {
+                LLRect hud_rect = full_window;
+                hud_rect.mBottom += 50;
+                if (gMenuBarView)
+                {
+                        hud_rect.mTop -= gMenuBarView->getRect().getHeight();
+                }
+                gHUDView = new LLHUDView(hud_rect);
+                // put behind everything else in the UI
+                mRootView->addChildAtEnd(gHUDView);
+        }
 }
 
 // Destroy the UI
@@ -2180,7 +2197,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
                 if (key < 0x80)
                 {
                         // Not a special key, so likely (we hope) to generate a character.  Let it fall through to character handler first.
-                        return gFocusMgr.childHasKeyboardFocus(mRootView);
+                        return (gFocusMgr.getKeyboardFocus() != NULL);
                 }
         }
 
@@ -2243,7 +2260,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
         }
 
         // Traverses up the hierarchy
-        LLUICtrl* keyboard_focus = gFocusMgr.getKeyboardFocus();
+        LLFocusableElement* keyboard_focus = gFocusMgr.getKeyboardFocus();
         if( keyboard_focus )
         {
                 // arrow keys move avatar while chatting hack
@@ -2377,7 +2394,7 @@ BOOL LLViewerWindow::handleUnicodeChar(llwchar uni_char, MASK mask)
         }
 
         // Traverses up the hierarchy
-        LLView* keyboard_focus = gFocusMgr.getKeyboardFocus();
+        LLFocusableElement* keyboard_focus = gFocusMgr.getKeyboardFocus();
         if( keyboard_focus )
         {
                 if (keyboard_focus->handleUnicodeChar(uni_char, FALSE))
@@ -2530,7 +2547,7 @@ BOOL LLViewerWindow::handlePerFrameHover()
         }
 
         // clean up current focus
-        LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
+        LLUICtrl* cur_focus = dynamic_cast<LLUICtrl*>(gFocusMgr.getKeyboardFocus());
         if (cur_focus)
         {
                 if (!cur_focus->isInVisibleChain() || !cur_focus->isInEnabledChain())
@@ -2910,12 +2927,18 @@ BOOL LLViewerWindow::handlePerFrameHover()
         {
                 do_pick = FALSE;
         }
+        
+        if(LLViewerMediaFocus::getInstance()->getFocus())
+        {
+                // When in-world media is in focus, pick every frame so that browser mouse-overs, dragging scrollbars, etc. work properly.
+                do_pick = TRUE;
+        }
 
         if (do_pick)
         {
                 mouse_moved_since_pick = FALSE;
                 mPickTimer.reset();
-                pickAsync(getCurrentMouseX(), getCurrentMouseY(), mask, hoverPickCallback, TRUE);
+                pickAsync(getCurrentMouseX(), getCurrentMouseY(), mask, hoverPickCallback, TRUE, TRUE);
         }
 
         previous_x = x;
@@ -4694,7 +4717,7 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
         BOOL result_first_try = FALSE;
         BOOL result_second_try = FALSE;
 
-        LLUICtrl* keyboard_focus = gFocusMgr.getKeyboardFocus();
+        LLFocusableElement* keyboard_focus = gFocusMgr.getKeyboardFocus();
         send_agent_pause();
         llinfos << "Stopping GL during changeDisplaySettings" << llendl;
         stopGL();
@@ -4923,7 +4946,6 @@ LLBottomPanel::LLBottomPanel(const LLRect &rect) :
 
         mFactoryMap["toolbar"] = LLCallbackMap(createToolBar, NULL);
         mFactoryMap["overlay"] = LLCallbackMap(createOverlayBar, NULL);
-        mFactoryMap["hud"] = LLCallbackMap(createHUD, NULL);
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_bars.xml", &getFactoryMap());
         
         setOrigin(rect.mLeft, rect.mBottom);
@@ -4946,12 +4968,6 @@ void LLBottomPanel::draw()
         LLPanel::draw();
 }
 
-void* LLBottomPanel::createHUD(void* data)
-{
-        gHUDView = new LLHUDView();
-        return gHUDView;
-}
-
 
 void* LLBottomPanel::createOverlayBar(void* data)
 {
@@ -5164,12 +5180,8 @@ void LLPickInfo::updateXYCoords()
                 LLPointer<LLViewerImage> imagep = gImageList.getImage(tep->getID());
                 if(mUVCoords.mV[VX] >= 0.f && mUVCoords.mV[VY] >= 0.f && imagep.notNull())
                 {
-                        LLCoordGL coords;
-                        
-                        coords.mX = llround(mUVCoords.mV[VX] * (F32)imagep->getWidth());
-                        coords.mY = llround(mUVCoords.mV[VY] * (F32)imagep->getHeight());
-
-                        gViewerWindow->getWindow()->convertCoords(coords, &mXYCoords);
+                        mXYCoords.mX = llround(mUVCoords.mV[VX] * (F32)imagep->getWidth());
+                        mXYCoords.mY = llround((1.f - mUVCoords.mV[VY]) * (F32)imagep->getHeight());
                 }
         }
 }