From 979ddb2ec952f836f7cde7cbc85559b8e9582416 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 4 Feb 2010 23:41:54 -0600
Subject: No more matrix ops in UI code.

---
 indra/llui/lltabcontainer.cpp |  12 ++---
 indra/llui/llui.cpp           | 112 +++++++++++++++++++++++++++---------------
 indra/llui/llviewborder.cpp   |  58 ----------------------
 indra/llui/llviewborder.h     |   3 +-
 4 files changed, 80 insertions(+), 105 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 6be76605fd..f11bc2173c 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -402,15 +402,15 @@ void LLTabContainer::draw()
 		if( mIsVertical && has_scroll_arrows )
 		{
 			// Redraw the arrows so that they appears on top.
-			gGL.pushMatrix();
-			gGL.translatef((F32)mPrevArrowBtn->getRect().mLeft, (F32)mPrevArrowBtn->getRect().mBottom, 0.f);
+			gGL.pushUIMatrix();
+			gGL.translateUI((F32)mPrevArrowBtn->getRect().mLeft, (F32)mPrevArrowBtn->getRect().mBottom, 0.f);
 			mPrevArrowBtn->draw();
-			gGL.popMatrix();
+			gGL.popUIMatrix();
 
-			gGL.pushMatrix();
-			gGL.translatef((F32)mNextArrowBtn->getRect().mLeft, (F32)mNextArrowBtn->getRect().mBottom, 0.f);
+			gGL.pushUIMatrix();
+			gGL.translateUI((F32)mNextArrowBtn->getRect().mLeft, (F32)mNextArrowBtn->getRect().mBottom, 0.f);
 			mNextArrowBtn->draw();
-			gGL.popMatrix();
+			gGL.popUIMatrix();
 		}
 	}
 
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index d0ed3b6fca..0e2e8bf8ed 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -39,6 +39,7 @@
 
 // Linden library includes
 #include "v2math.h"
+#include "m3math.h"
 #include "v4color.h"
 #include "llrender.h"
 #include "llrect.h"
@@ -180,19 +181,19 @@ void gl_rect_2d_offset_local( S32 left, S32 top, S32 right, S32 bottom, const LL
 
 void gl_rect_2d_offset_local( S32 left, S32 top, S32 right, S32 bottom, S32 pixel_offset, BOOL filled)
 {
-	gGL.pushMatrix();
+	gGL.pushUIMatrix();
 	left += LLFontGL::sCurOrigin.mX;
 	right += LLFontGL::sCurOrigin.mX;
 	bottom += LLFontGL::sCurOrigin.mY;
 	top += LLFontGL::sCurOrigin.mY;
 
-	glLoadIdentity();
+	gGL.loadUIIdentity();
 	gl_rect_2d(llfloor((F32)left * LLUI::sGLScaleFactor.mV[VX]) - pixel_offset,
 				llfloor((F32)top * LLUI::sGLScaleFactor.mV[VY]) + pixel_offset,
 				llfloor((F32)right * LLUI::sGLScaleFactor.mV[VX]) + pixel_offset,
 				llfloor((F32)bottom * LLUI::sGLScaleFactor.mV[VY]) - pixel_offset,
 				filled);
-	gGL.popMatrix();
+	gGL.popUIMatrix();
 }
 
 
@@ -508,9 +509,9 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLTex
 		gGL.getTexUnit(0)->setTextureAlphaBlend(LLTexUnit::TBO_MULT, LLTexUnit::TBS_TEX_ALPHA, LLTexUnit::TBS_VERT_ALPHA);
 	}
 
-	gGL.pushMatrix();
+	gGL.pushUIMatrix();
 	{
-		gGL.translatef((F32)x, (F32)y, 0.f);
+		gGL.translateUI((F32)x, (F32)y, 0.f);
 
 		gGL.getTexUnit(0)->bind(image);
 
@@ -637,7 +638,7 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLTex
 		}
 		gGL.end();
 	}
-	gGL.popMatrix();
+	gGL.popUIMatrix();
 
 	if (solid_color)
 	{
@@ -660,39 +661,72 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
 
 	LLGLSUIDefault gls_ui;
 
-	gGL.pushMatrix();
+
+	gGL.getTexUnit(0)->bind(image);
+
+	gGL.color4fv(color.mV);
+
+	if (degrees == 0.f)
 	{
-		gGL.translatef((F32)x, (F32)y, 0.f);
-		if( degrees )
+		gGL.pushUIMatrix();
+		gGL.translateUI((F32)x, (F32)y, 0.f);
+			
+		gGL.begin(LLRender::QUADS);
 		{
-			F32 offset_x = F32(width/2);
-			F32 offset_y = F32(height/2);
-			gGL.translatef( offset_x, offset_y, 0.f);
-			glRotatef( degrees, 0.f, 0.f, 1.f );
-			gGL.translatef( -offset_x, -offset_y, 0.f );
+			gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop);
+			gGL.vertex2i(width, height );
+
+			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop);
+			gGL.vertex2i(0, height );
+
+			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom);
+			gGL.vertex2i(0, 0);
+
+			gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom);
+			gGL.vertex2i(width, 0);
 		}
+		gGL.end();
+		gGL.popUIMatrix();
+	}
+	else
+	{
+		gGL.pushUIMatrix();
+		gGL.translateUI((F32)x, (F32)y, 0.f);
+	
+		F32 offset_x = F32(width/2);
+		F32 offset_y = F32(height/2);
+
+		gGL.translateUI(offset_x, offset_y, 0.f);
 
+		LLMatrix3 quat(0.f, 0.f, degrees*DEG_TO_RAD);
+		
 		gGL.getTexUnit(0)->bind(image);
 
 		gGL.color4fv(color.mV);
 		
 		gGL.begin(LLRender::QUADS);
 		{
+			LLVector3 v;
+
+			v = LLVector3(offset_x, offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop);
-			gGL.vertex2i(width, height );
+			gGL.vertex2i(v.mV[0], v.mV[1] );
 
+			v = LLVector3(-offset_x, offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop);
-			gGL.vertex2i(0, height );
+			gGL.vertex2i(v.mV[0], v.mV[1] );
 
+			v = LLVector3(-offset_x, -offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom);
-			gGL.vertex2i(0, 0);
+			gGL.vertex2i(v.mV[0], v.mV[1] );
 
+			v = LLVector3(offset_x, -offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom);
-			gGL.vertex2i(width, 0);
+			gGL.vertex2i(v.mV[0], v.mV[1] );
 		}
 		gGL.end();
+		gGL.popUIMatrix();
 	}
-	gGL.popMatrix();
 }
 
 
@@ -747,9 +781,9 @@ void gl_arc_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled, F
 		end_angle += F_TWO_PI;
 	}
 
-	gGL.pushMatrix();
+	gGL.pushUIMatrix();
 	{
-		gGL.translatef(center_x, center_y, 0.f);
+		gGL.translateUI(center_x, center_y, 0.f);
 
 		// Inexact, but reasonably fast.
 		F32 delta = (end_angle - start_angle) / steps;
@@ -780,15 +814,15 @@ void gl_arc_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled, F
 		}
 		gGL.end();
 	}
-	gGL.popMatrix();
+	gGL.popUIMatrix();
 }
 
 void gl_circle_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled)
 {
-	gGL.pushMatrix();
+	gGL.pushUIMatrix();
 	{
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-		gGL.translatef(center_x, center_y, 0.f);
+		gGL.translateUI(center_x, center_y, 0.f);
 
 		// Inexact, but reasonably fast.
 		F32 delta = F_TWO_PI / steps;
@@ -819,7 +853,7 @@ void gl_circle_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled
 		}
 		gGL.end();
 	}
-	gGL.popMatrix();
+	gGL.popUIMatrix();
 }
 
 // Renders a ring with sides (tube shape)
@@ -846,9 +880,9 @@ void gl_deep_circle( F32 radius, F32 depth, S32 steps )
 
 void gl_ring( F32 radius, F32 width, const LLColor4& center_color, const LLColor4& side_color, S32 steps, BOOL render_center )
 {
-	gGL.pushMatrix();
+	gGL.pushUIMatrix();
 	{
-		gGL.translatef(0.f, 0.f, -width / 2);
+		gGL.translateUI(0.f, 0.f, -width / 2);
 		if( render_center )
 		{
 			gGL.color4fv(center_color.mV);
@@ -857,11 +891,11 @@ void gl_ring( F32 radius, F32 width, const LLColor4& center_color, const LLColor
 		else
 		{
 			gl_washer_2d(radius, radius - width, steps, side_color, side_color);
-			gGL.translatef(0.f, 0.f, width);
+			gGL.translateUI(0.f, 0.f, width);
 			gl_washer_2d(radius - width, radius, steps, side_color, side_color);
 		}
 	}
-	gGL.popMatrix();
+	gGL.popUIMatrix();
 }
 
 // Draw gray and white checkerboard with black border
@@ -1050,9 +1084,9 @@ void gl_segmented_rect_2d_tex(const S32 left,
 	S32 width = llabs(right - left);
 	S32 height = llabs(top - bottom);
 
-	gGL.pushMatrix();
+	gGL.pushUIMatrix();
 
-	gGL.translatef((F32)left, (F32)bottom, 0.f);
+	gGL.translateUI((F32)left, (F32)bottom, 0.f);
 	LLVector2 border_uv_scale((F32)border_size / (F32)texture_width, (F32)border_size / (F32)texture_height);
 
 	if (border_uv_scale.mV[VX] > 0.5f)
@@ -1193,7 +1227,7 @@ void gl_segmented_rect_2d_tex(const S32 left,
 	}
 	gGL.end();
 
-	gGL.popMatrix();
+	gGL.popUIMatrix();
 }
 
 void gl_segmented_rect_2d_fragment_tex(const S32 left, 
@@ -1210,9 +1244,9 @@ void gl_segmented_rect_2d_fragment_tex(const S32 left,
 	S32 width = llabs(right - left);
 	S32 height = llabs(top - bottom);
 
-	gGL.pushMatrix();
+	gGL.pushUIMatrix();
 
-	gGL.translatef((F32)left, (F32)bottom, 0.f);
+	gGL.translateUI((F32)left, (F32)bottom, 0.f);
 	LLVector2 border_uv_scale((F32)border_size / (F32)texture_width, (F32)border_size / (F32)texture_height);
 
 	if (border_uv_scale.mV[VX] > 0.5f)
@@ -1383,7 +1417,7 @@ void gl_segmented_rect_2d_fragment_tex(const S32 left,
 	}
 	gGL.end();
 
-	gGL.popMatrix();
+	gGL.popUIMatrix();
 }
 
 void gl_segmented_rect_3d_tex(const LLVector2& border_scale, const LLVector3& border_width, 
@@ -1591,7 +1625,7 @@ void LLUI::dirtyRect(LLRect rect)
 //static
 void LLUI::translate(F32 x, F32 y, F32 z)
 {
-	gGL.translatef(x,y,z);
+	gGL.translateUI(x,y,z);
 	LLFontGL::sCurOrigin.mX += (S32) x;
 	LLFontGL::sCurOrigin.mY += (S32) y;
 	LLFontGL::sCurOrigin.mZ += z;
@@ -1600,14 +1634,14 @@ void LLUI::translate(F32 x, F32 y, F32 z)
 //static
 void LLUI::pushMatrix()
 {
-	gGL.pushMatrix();
+	gGL.pushUIMatrix();
 	LLFontGL::sOriginStack.push_back(LLFontGL::sCurOrigin);
 }
 
 //static
 void LLUI::popMatrix()
 {
-	gGL.popMatrix();
+	gGL.popUIMatrix();
 	LLFontGL::sCurOrigin = *LLFontGL::sOriginStack.rbegin();
 	LLFontGL::sOriginStack.pop_back();
 }
@@ -1615,7 +1649,7 @@ void LLUI::popMatrix()
 //static 
 void LLUI::loadIdentity()
 {
-	glLoadIdentity();
+	gGL.loadUIIdentity(); 
 	LLFontGL::sCurOrigin.mX = 0;
 	LLFontGL::sCurOrigin.mY = 0;
 	LLFontGL::sCurOrigin.mZ = 0;
diff --git a/indra/llui/llviewborder.cpp b/indra/llui/llviewborder.cpp
index 30717f87de..bd9c43c97f 100644
--- a/indra/llui/llviewborder.cpp
+++ b/indra/llui/llviewborder.cpp
@@ -125,14 +125,6 @@ void LLViewBorder::draw()
 			llassert( FALSE );  // not implemented
 		}
 	}
-	else
-	if( STYLE_TEXTURE == mStyle )
-	{
-		if( mTexture )
-		{
-			drawTextures();
-		}
-	}
 
 	LLView::draw();
 }
@@ -255,56 +247,6 @@ void LLViewBorder::drawTwoPixelLines()
 	gl_line_2d(left+1, bottom+1, right-1, bottom+1);
 }
 
-void LLViewBorder::drawTextures()
-{
-	//LLGLSUIDefault gls_ui;
-
-	//llassert( FALSE );  // TODO: finish implementing
-
-	//gGL.color4fv(UI_VERTEX_COLOR.mV);
-
-	//gGL.getTexUnit(0)->bind(mTexture);
-	//gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_WRAP);
-
-	//drawTextureTrapezoid(   0.f, mBorderWidth, getRect().getWidth(),  0,					0 );
-	//drawTextureTrapezoid(  90.f, mBorderWidth, getRect().getHeight(), (F32)getRect().getWidth(),0 );
-	//drawTextureTrapezoid( 180.f, mBorderWidth, getRect().getWidth(),  (F32)getRect().getWidth(),(F32)getRect().getHeight() );
-	//drawTextureTrapezoid( 270.f, mBorderWidth, getRect().getHeight(), 0,					(F32)getRect().getHeight() );
-}
-
-
-void LLViewBorder::drawTextureTrapezoid( F32 degrees, S32 width, S32 length, F32 start_x, F32 start_y )
-{
-	gGL.pushMatrix();
-	{
-		gGL.translatef(start_x, start_y, 0.f);
-		glRotatef( degrees, 0, 0, 1 );
-
-		gGL.begin(LLRender::QUADS);
-		{
-			//      width, width   /---------\ length-width, width		//
-			//	   			      /           \							//
-			//				     /			   \						//
-			//				    /---------------\						//
-			//    			0,0					  length, 0				//
-
-			gGL.texCoord2f( 0, 0 );
-			gGL.vertex2i( 0, 0 );
-
-			gGL.texCoord2f( (GLfloat)length, 0 );
-			gGL.vertex2i( length, 0 );
-
-			gGL.texCoord2f( (GLfloat)(length - width), (GLfloat)width );
-			gGL.vertex2i( length - width, width );
-
-			gGL.texCoord2f( (GLfloat)width, (GLfloat)width );
-			gGL.vertex2i( width, width );
-		}
-		gGL.end();
-	}
-	gGL.popMatrix();
-}
-
 BOOL LLViewBorder::getBevelFromAttribute(LLXMLNodePtr node, LLViewBorder::EBevel& bevel_style)
 {
 	if (node->hasAttribute("bevel_style"))
diff --git a/indra/llui/llviewborder.h b/indra/llui/llviewborder.h
index 92fd569325..342e84fd93 100644
--- a/indra/llui/llviewborder.h
+++ b/indra/llui/llviewborder.h
@@ -99,8 +99,7 @@ private:
 	void		drawOnePixelLines();
 	void		drawTwoPixelLines();
 	void		drawTextures();
-	void		drawTextureTrapezoid( F32 degrees, S32 width, S32 length, F32 start_x, F32 start_y );
-
+	
 	EBevel		mBevel;
 	EStyle		mStyle;
 	LLUIColor	mHighlightLight;
-- 
cgit v1.3


From 8ca06e7bf37f7e5391e14f74d8404bdc05d683d4 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Mon, 8 Feb 2010 08:19:32 -0800
Subject: nearby media pops up on hover

---
 indra/llui/lldockcontrol.cpp                       | 41 ++++++++++++
 indra/llui/lldockcontrol.h                         |  5 +-
 indra/newview/llappviewer.cpp                      |  3 -
 indra/newview/llstatusbar.cpp                      | 72 +++++++++++-----------
 .../skins/default/xui/en/panel_status_bar.xml      | 23 ++++++-
 5 files changed, 99 insertions(+), 45 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp
index d836a5f4cd..f91c07184d 100644
--- a/indra/llui/lldockcontrol.cpp
+++ b/indra/llui/lldockcontrol.cpp
@@ -162,7 +162,9 @@ bool LLDockControl::isDockVisible()
 			{
 			case LEFT: // to keep compiler happy
 				break;
+			case BOTTOM:
 			case TOP:
+			{
 				// check is dock inside parent rect
 				LLRect dockParentRect =
 						mDockWidget->getParent()->calcScreenRect();
@@ -173,6 +175,9 @@ bool LLDockControl::isDockVisible()
 				}
 				break;
 			}
+			default:
+				break;
+			}
 		}
 	}
 
@@ -254,6 +259,42 @@ void LLDockControl::moveDockable()
 		}
 		mDockTongueY = dockRect.mTop;
 
+		break;
+	case BOTTOM:
+		x = dockRect.getCenterX() - dockableRect.getWidth() / 2;
+		y = dockRect.mBottom;
+		// unique docking used with dock tongue, so add tongue height o the Y coordinate
+		if (use_tongue)
+		{
+			y -= mDockTongue->getHeight();
+		}
+
+		// check is dockable inside root view rect
+		if (x < rootRect.mLeft)
+		{
+			x = rootRect.mLeft;
+		}
+		if (x + dockableRect.getWidth() > rootRect.mRight)
+		{
+			x = rootRect.mRight - dockableRect.getWidth();
+		}
+
+		// calculate dock tongue position
+		dockParentRect = mDockWidget->getParent()->calcScreenRect();
+		if (dockRect.getCenterX() < dockParentRect.mLeft)
+		{
+			mDockTongueX = dockParentRect.mLeft - mDockTongue->getWidth() / 2;
+		}
+		else if (dockRect.getCenterX() > dockParentRect.mRight)
+		{
+			mDockTongueX = dockParentRect.mRight - mDockTongue->getWidth() / 2;;
+		}
+		else
+		{
+			mDockTongueX = dockRect.getCenterX() - mDockTongue->getWidth() / 2;
+		}
+		mDockTongueY = dockRect.mTop + mDockTongue->getHeight();
+
 		break;
 	}
 
diff --git a/indra/llui/lldockcontrol.h b/indra/llui/lldockcontrol.h
index 550955c4c5..a5caf68001 100644
--- a/indra/llui/lldockcontrol.h
+++ b/indra/llui/lldockcontrol.h
@@ -47,8 +47,9 @@ class LLDockControl
 public:
 	enum DocAt
 	{
-		TOP
-		,LEFT
+		TOP,
+		LEFT,
+		BOTTOM
 	};
 
 public:
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 2d694eefd3..5a2152e1e7 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1353,9 +1353,6 @@ bool LLAppViewer::cleanup()
 
 	llinfos << "Cache files removed" << llendflush;
 
-
-	cleanup_menus();
-
 	// Wait for any pending VFS IO
 	while (1)
 	{
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index bff32af228..a2648e4c3a 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -130,7 +130,6 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
 	
 	// status bar can possible overlay menus?
 	setMouseOpaque(FALSE);
-	setIsChrome(TRUE);
 
 	// size of day of the weeks and year
 	sDays.reserve(7);
@@ -140,9 +139,39 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
 	mHealthTimer = new LLFrameTimer();
 
 	LLUICtrlFactory::getInstance()->buildPanel(this,"panel_status_bar.xml");
+}
 
-	// status bar can never get a tab
-	setFocusRoot(FALSE);
+LLStatusBar::~LLStatusBar()
+{
+	delete mBalanceTimer;
+	mBalanceTimer = NULL;
+
+	delete mHealthTimer;
+	mHealthTimer = NULL;
+
+	// LLView destructor cleans up children
+}
+
+//-----------------------------------------------------------------------
+// Overrides
+//-----------------------------------------------------------------------
+
+// virtual
+void LLStatusBar::draw()
+{
+	refresh();
+	LLPanel::draw();
+}
+
+BOOL LLStatusBar::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+	show_navbar_context_menu(this,x,y);
+	return TRUE;
+}
+
+BOOL LLStatusBar::postBuild()
+{
+	gMenuBarView->setRightMouseDownCallback(boost::bind(&show_navbar_context_menu, _1, _2, _3));
 
 	// build date necessary data (must do after panel built)
 	setupDate();
@@ -158,7 +187,9 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
 	mBtnVolume = getChild<LLButton>( "volume_btn" );
 	mBtnVolume->setClickedCallback( onClickVolume, this );
 	mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this));
-	mBtnVolume->setIsChrome(TRUE);
+
+	LLButton* media_toggle = getChild<LLButton>("media_toggle_btn");
+	media_toggle->setMouseEnterCallback(boost::bind(&LLFloaterReg::showInstance, "nearby_media", LLSD(), true));
 
 	gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&LLStatusBar::onVolumeChanged, this, _2));
 
@@ -218,39 +249,6 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
 	mPanelVolumePulldown->setShape(volume_pulldown_rect);
 	mPanelVolumePulldown->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
 	mPanelVolumePulldown->setVisible(FALSE);
-}
-
-LLStatusBar::~LLStatusBar()
-{
-	delete mBalanceTimer;
-	mBalanceTimer = NULL;
-
-	delete mHealthTimer;
-	mHealthTimer = NULL;
-
-	// LLView destructor cleans up children
-}
-
-//-----------------------------------------------------------------------
-// Overrides
-//-----------------------------------------------------------------------
-
-// virtual
-void LLStatusBar::draw()
-{
-	refresh();
-	LLPanel::draw();
-}
-
-BOOL LLStatusBar::handleRightMouseDown(S32 x, S32 y, MASK mask)
-{
-	show_navbar_context_menu(this,x,y);
-	return TRUE;
-}
-
-BOOL LLStatusBar::postBuild()
-{
-	gMenuBarView->setRightMouseDownCallback(boost::bind(&show_navbar_context_menu, _1, _2, _3));
 
 	return TRUE;
 }
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 5754f67045..77eb9f2a75 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -3,6 +3,7 @@
  background_opaque="true"
  background_visible="true"
  bg_opaque_color="MouseGray"
+ chrome="true" 
  follows="top|right"
  height="19"
  layout="topleft"
@@ -10,6 +11,7 @@
  mouse_opaque="false"
  name="status"
  top="19"
+ tab_stop="false" 
  width="1000">
     <panel.string
      name="StatBarDaysOfWeek">
@@ -73,7 +75,7 @@
      pad_bottom="2"
      tool_tip="Click to buy more L$"
      top="2"
-     width="71" />
+     width="45" />
     <text
      type="string"
      font="SansSerifSmall"
@@ -86,9 +88,24 @@
      left_pad="0"
      name="TimeText"
      tool_tip="Current time (Pacific)"
-     width="89">
+     width="80">
         24:00 AM PST
     </text>
+    <button
+     follows="right|top"
+     height="15"
+     image_selected="button_anim_play.tga"
+     image_unselected="button_anim_pause.tga"
+     image_pressed="button_anim_pause_selected.tga"
+     image_pressed_selected="button_anim_play_selected.tga"
+     is_toggle="true"
+     left_pad="15"
+     top="2"
+     name="media_toggle_btn"
+     tool_tip="Click to toggle media"
+     width="16" >
+    </button>
+
     <button
      follows="right|top"
      height="15"
@@ -96,7 +113,7 @@
      image_pressed="Audio_Press"
      image_unselected="Audio_Off"
      is_toggle="true"
-     left_pad="18"
+     left_pad="5"
      top="2"
      name="volume_btn"
      tool_tip="Global Volume Control"
-- 
cgit v1.3


From 75916b486cca96e36cd11d92c0b3c21cb7e72d05 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Wed, 10 Feb 2010 10:46:37 -0800
Subject: fixed tongue positioning

---
 indra/llui/lldockcontrol.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llui')

diff --git a/indra/llui/lldockcontrol.cpp b/indra/llui/lldockcontrol.cpp
index f91c07184d..d738b10130 100644
--- a/indra/llui/lldockcontrol.cpp
+++ b/indra/llui/lldockcontrol.cpp
@@ -293,7 +293,7 @@ void LLDockControl::moveDockable()
 		{
 			mDockTongueX = dockRect.getCenterX() - mDockTongue->getWidth() / 2;
 		}
-		mDockTongueY = dockRect.mTop + mDockTongue->getHeight();
+		mDockTongueY = dockRect.mBottom - mDockTongue->getHeight();
 
 		break;
 	}
-- 
cgit v1.3


From 6c5b984bf670e34fd88a8f1a0bdeb1042fa531b2 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Thu, 11 Feb 2010 18:06:25 -0800
Subject: converted llfloaternearbymedia to llpanelnearbymedia moved from
 LLTransientDockableFloater model to popup panel model like volume popup

---
 indra/llui/llscrolllistctrl.cpp                    |   4 +-
 indra/newview/CMakeLists.txt                       |   4 +-
 indra/newview/llpanelnearbymedia.cpp               | 825 +++++++++++++++++++++
 indra/newview/llpanelnearbymedia.h                 | 157 ++++
 indra/newview/llpanelvolumepulldown.cpp            |   5 +-
 indra/newview/llstatusbar.cpp                      |  33 +-
 indra/newview/llstatusbar.h                        |   7 +-
 indra/newview/llviewerfloaterreg.cpp               |   2 -
 indra/newview/llviewermedia.h                      |   2 +-
 indra/newview/llviewerparcelmgr.cpp                |  10 +-
 .../skins/default/xui/en/panel_nearby_media.xml    | 501 +++++++++++++
 11 files changed, 1533 insertions(+), 17 deletions(-)
 create mode 100644 indra/newview/llpanelnearbymedia.cpp
 create mode 100644 indra/newview/llpanelnearbymedia.h
 create mode 100644 indra/newview/skins/default/xui/en/panel_nearby_media.xml

(limited to 'indra/llui')

diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 478e270c98..ac4811210b 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1388,6 +1388,8 @@ void LLScrollListCtrl::drawItems()
 
 	LLGLSUIDefault gls_ui;
 	
+	F32 alpha = getDrawContext().mAlpha;
+
 	{
 		LLLocalClipRect clip(mItemListRect);
 
@@ -1463,7 +1465,7 @@ void LLScrollListCtrl::drawItems()
 					bg_color = mBgReadOnlyColor.get();
 				}
 
-				item->draw(item_rect, fg_color, bg_color, highlight_color, mColumnPadding);
+				item->draw(item_rect, fg_color % alpha, bg_color% alpha, highlight_color % alpha, mColumnPadding);
 
 				cur_y -= mLineHeight;
 			}
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index cd7c002096..6242783717 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -182,7 +182,6 @@ set(viewer_SOURCE_FILES
     llfloatermediasettings.cpp
     llfloatermemleak.cpp
     llfloaternamedesc.cpp
-    llfloaternearbymedia.cpp
     llfloaternotificationsconsole.cpp
     llfloateropenobject.cpp
     llfloaterparcel.cpp
@@ -323,6 +322,7 @@ set(viewer_SOURCE_FILES
     llpanelmediasettingspermissions.cpp
     llpanelmediasettingssecurity.cpp
     llpanelme.cpp
+    llpanelnearbymedia.cpp
     llpanelobject.cpp
     llpanelobjectinventory.cpp
     llpaneloutfitsinventory.cpp
@@ -682,7 +682,6 @@ set(viewer_HEADER_FILES
     llfloatermediasettings.h
     llfloatermemleak.h
     llfloaternamedesc.h
-    llfloaternearbymedia.h
     llfloaternotificationsconsole.h
     llfloateropenobject.h
     llfloaterparcel.h
@@ -818,6 +817,7 @@ set(viewer_HEADER_FILES
     llpanelmediasettingspermissions.h
     llpanelmediasettingssecurity.h
     llpanelme.h
+    llpanelnearbymedia.h
     llpanelobject.h
     llpanelobjectinventory.h
     llpaneloutfitsinventory.h
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
new file mode 100644
index 0000000000..82aa67783d
--- /dev/null
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -0,0 +1,825 @@
+/** 
+ * @file llpanelnearbymedia.cpp
+ * @brief Management interface for muting and controlling nearby media
+ *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
+ * Copyright (c) 2005-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpanelnearbymedia.h"
+
+#include "llaudioengine.h"
+#include "llcheckboxctrl.h"
+#include "llcombobox.h"
+#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
+#include "llscrolllistcell.h"
+#include "llsliderctrl.h"
+#include "llagent.h"
+#include "llagentui.h"
+#include "llbutton.h"
+#include "lltextbox.h"
+#include "llviewermedia.h"
+#include "llviewerparcelmedia.h"
+#include "llviewerregion.h"
+#include "llviewermediafocus.h"
+#include "llviewerparcelmgr.h"
+#include "llparcel.h"
+#include "llpluginclassmedia.h"
+#include "llvovolume.h"
+#include "llstatusbar.h"
+#include "llsdutil.h"
+
+#include <stringize.h>
+
+extern LLControlGroup gSavedSettings;
+
+// Ugh, isInternetStreamPlaying() returns not a bool, but an *int*, with
+// 0 = stopped, 1 = playing, 2 = paused.
+static const int PARCEL_AUDIO_STOPPED = 0;
+static const int PARCEL_AUDIO_PLAYING = 1;
+static const int PARCEL_AUDIO_PAUSED = 2;
+
+//
+// LLPanelNearByMedia
+//
+
+LLPanelNearByMedia::LLPanelNearByMedia()
+:	mMediaList(NULL),
+	mEnableAllCtrl(NULL),
+	mEnableParcelMediaCtrl(NULL),	  
+	mAllMediaDisabled(false),
+	mDebugInfoVisible(false)
+{
+	mParcelAudioAutoStart = gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING);
+
+	mCommitCallbackRegistrar.add("MediaListCtrl.EnableAll",		boost::bind(&LLPanelNearByMedia::onClickEnableAll, this));
+	mCommitCallbackRegistrar.add("MediaListCtrl.DisableAll",		boost::bind(&LLPanelNearByMedia::onClickDisableAll, this));
+	mCommitCallbackRegistrar.add("ParcelMediaCtrl.ParcelMediaVolume",		boost::bind(&LLPanelNearByMedia::onParcelMediaVolumeSlider, this));
+	mCommitCallbackRegistrar.add("ParcelMediaCtrl.MuteParcelMedia",		boost::bind(&LLPanelNearByMedia::onClickMuteParcelMedia, this));
+	mCommitCallbackRegistrar.add("ParcelMediaCtrl.EnableParcelMedia",		boost::bind(&LLPanelNearByMedia::onClickEnableParcelMedia, this));
+	mCommitCallbackRegistrar.add("ParcelMediaCtrl.DisableParcelMedia",		boost::bind(&LLPanelNearByMedia::onClickDisableParcelMedia, this));
+	mCommitCallbackRegistrar.add("ParcelMediaCtrl.Play",		boost::bind(&LLPanelNearByMedia::onClickParcelMediaPlay, this));
+	mCommitCallbackRegistrar.add("ParcelMediaCtrl.Stop",		boost::bind(&LLPanelNearByMedia::onClickParcelMediaStop, this));
+	mCommitCallbackRegistrar.add("ParcelMediaCtrl.Pause",		boost::bind(&LLPanelNearByMedia::onClickParcelMediaPause, this));
+	mCommitCallbackRegistrar.add("ParcelAudioCtrl.Play",		boost::bind(&LLPanelNearByMedia::onClickParcelAudioPlay, this));
+	mCommitCallbackRegistrar.add("ParcelAudioCtrl.Stop",		boost::bind(&LLPanelNearByMedia::onClickParcelAudioStop, this));
+	mCommitCallbackRegistrar.add("ParcelAudioCtrl.Pause",		boost::bind(&LLPanelNearByMedia::onClickParcelAudioPause, this));
+	LLUICtrlFactory::instance().buildPanel(this, "panel_nearby_media.xml");
+}
+
+LLPanelNearByMedia::~LLPanelNearByMedia()
+{
+}
+
+BOOL LLPanelNearByMedia::postBuild()
+{
+	LLPanel::postBuild();
+
+	mMediaList = getChild<LLScrollListCtrl>("media_list");
+	mEnableAllCtrl = getChild<LLUICtrl>("all_nearby_media_enable_btn");
+	mDisableAllCtrl = getChild<LLUICtrl>("all_nearby_media_disable_btn");
+	mParcelMediaVolumeSlider = getChild<LLSliderCtrl>("parcel_media_volume");
+	mParcelMediaMuteCtrl = getChild<LLButton>("parcel_media_mute");
+	mEnableParcelMediaCtrl = getChild<LLUICtrl>("parcel_media_enable_btn");
+	mDisableParcelMediaCtrl = getChild<LLUICtrl>("parcel_media_disable_btn");
+	mParcelMediaText = getChild<LLTextBox>("parcel_media_name");
+	mItemCountText = getChild<LLTextBox>("media_item_count");
+	mParcelMediaPlayCtrl = getChild<LLButton>("parcel_media_play_btn");
+	mParcelMediaPauseCtrl = getChild<LLButton>("parcel_media_pause_btn");
+	mParcelMediaCtrl = getChild<LLUICtrl>("parcel_media_ctrls");
+	mParcelAudioPlayCtrl = getChild<LLButton>("parcel_audio_play_btn");
+	mParcelAudioPauseCtrl = getChild<LLButton>("parcel_audio_pause_btn");
+	mParcelAudioCtrl = getChild<LLUICtrl>("parcel_audio_ctrls");
+	mShowCtrl = getChild<LLComboBox>("show_combo");
+	
+	mEmptyNameString = getString("empty_item_text");
+	mDefaultParcelMediaName = getString("default_parcel_media_name");
+	mDefaultParcelMediaToolTip = getString("default_parcel_media_tool_tip");
+	
+	mMediaList->setDoubleClickCallback(onZoomMedia, this);
+	mMediaList->sortByColumnIndex(PROXIMITY_COLUMN, TRUE);
+	mMediaList->sortByColumnIndex(VISIBILITY_COLUMN, FALSE);
+
+	std::string url = LLViewerParcelMedia::getURL();
+	if (!url.empty())
+	{
+		std::string name = LLViewerParcelMedia::getName();
+		mParcelMediaText->setValue(name.empty()?url:name);
+		mParcelMediaText->setToolTip(url);	
+	}
+	refreshList();
+	updateColumns();
+	
+	return TRUE;
+}
+
+/*virtual*/
+void LLPanelNearByMedia::onMouseEnter(S32 x, S32 y, MASK mask)
+{
+	mHoverTimer.stop();
+	LLPanel::onMouseEnter(x,y,mask);
+}
+
+
+/*virtual*/
+void LLPanelNearByMedia::onMouseLeave(S32 x, S32 y, MASK mask)
+{
+	mHoverTimer.start();
+	LLPanel::onMouseLeave(x,y,mask);
+}
+
+/*virtual*/ 
+void LLPanelNearByMedia::handleVisibilityChange ( BOOL new_visibility )
+{
+	if (new_visibility)	
+	{
+		mHoverTimer.start(); // timer will be stopped when mouse hovers over panel
+		gFocusMgr.setTopCtrl(this);
+	}
+	else
+	{
+		mHoverTimer.stop();
+		if (gFocusMgr.getTopCtrl() == this)
+		{
+			gFocusMgr.setTopCtrl(NULL);
+		}
+	}
+}
+
+/*virtual*/ 
+void LLPanelNearByMedia::onTopLost ()
+{
+	setVisible(FALSE);
+}
+
+
+const F32 AUTO_CLOSE_FADE_TIME_START= 4.0f;
+const F32 AUTO_CLOSE_FADE_TIME_END = 5.0f;
+
+void LLPanelNearByMedia::draw()
+{
+	mItemCountText->setValue(llformat(getString("media_item_count_format").c_str(), mMediaList->getItemCount()));
+	
+	refreshParcelMediaUI();
+	refreshParcelAudioUI();
+	refreshList();
+	
+	F32 alpha = mHoverTimer.getStarted() 
+		? clamp_rescale(mHoverTimer.getElapsedTimeF32(), AUTO_CLOSE_FADE_TIME_START, AUTO_CLOSE_FADE_TIME_END, 1.f, 0.f)
+		: 1.0f;
+	LLViewDrawContext context(alpha);
+
+	LLPanel::draw();
+
+	if (alpha == 0.f)
+	{
+		setVisible(false);
+	}
+}
+
+bool LLPanelNearByMedia::getParcelAudioAutoStart()
+{
+	return mParcelAudioAutoStart;
+}
+
+void LLPanelNearByMedia::addMediaItem(const LLUUID &id)
+{
+	if (NULL == mMediaList) return;
+	
+	// Just set up the columns -- the values will be filled in by updateMediaItem().
+	
+	LLSD row;
+	row["id"] = id;
+	
+	LLSD &columns = row["columns"];
+	
+	columns[CHECKBOX_COLUMN]["column"] = "media_checkbox_ctrl";
+	columns[CHECKBOX_COLUMN]["type"] = "checkbox";	
+	//if(mDebugInfoVisible)
+	{
+	columns[PROXIMITY_COLUMN]["column"] = "media_proximity";
+	columns[PROXIMITY_COLUMN]["value"] = "";
+		columns[VISIBILITY_COLUMN]["column"] = "media_visibility";
+		columns[VISIBILITY_COLUMN]["value"] = "";
+		columns[CLASS_COLUMN]["column"] = "media_class";
+		columns[CLASS_COLUMN]["type"] = "text";
+		columns[CLASS_COLUMN]["value"] = "";
+	}
+	columns[NAME_COLUMN]["column"] = "media_name";
+	columns[NAME_COLUMN]["type"] = "text";
+	columns[NAME_COLUMN]["value"] = "";
+	//if(mDebugInfoVisible)
+	{
+		columns[DEBUG_COLUMN]["column"] = "media_debug";
+		columns[DEBUG_COLUMN]["type"] = "text";
+		columns[DEBUG_COLUMN]["value"] = "";
+	}
+	
+	LLScrollListItem* new_item = mMediaList->addElement(row);
+	LLScrollListCheck* scroll_list_check = dynamic_cast<LLScrollListCheck*>(new_item->getColumn(CHECKBOX_COLUMN));
+	if (scroll_list_check)
+	{
+		LLCheckBoxCtrl *check = scroll_list_check->getCheckBox();
+		check->setCommitCallback(boost::bind(&LLPanelNearByMedia::onCheckItem, this, _1, id));
+	}
+}
+
+void LLPanelNearByMedia::updateMediaItem(LLScrollListItem* item, LLViewerMediaImpl* impl)
+{
+	LLScrollListCell* cell = item->getColumn(PROXIMITY_COLUMN);
+	if(cell)
+	{
+		// since we are forced to sort by text, encode sort order as string
+		std::string proximity_string = STRINGIZE(/*llformat("%010d", */impl->getProximity());
+		std::string old_proximity_string = cell->getValue().asString();
+		if(proximity_string != old_proximity_string)
+		{
+			cell->setValue(proximity_string);
+			mMediaList->setNeedsSort(true);
+		}
+	}
+	
+	cell = item->getColumn(CHECKBOX_COLUMN);
+	if(cell)
+	{
+		cell->setValue(!impl->isMediaDisabled());
+	}
+	
+	cell = item->getColumn(VISIBILITY_COLUMN);
+	if(cell)
+	{
+		S32 old_visibility = cell->getValue();
+		S32 new_visibility = (impl->hasMedia()) ? 1 : ((impl->isMediaDisabled()) ? 0 : -1);
+		cell->setValue(STRINGIZE(new_visibility));
+		if (new_visibility != old_visibility)
+		{			
+			mMediaList->setNeedsSort(true);
+		}
+	}
+		
+	S32 media_class = -1;
+	cell = item->getColumn(NAME_COLUMN);
+	if(cell)
+	{
+		std::string name;
+		std::string url;
+		
+		getNameAndUrlHelper(impl, name, url, mEmptyNameString);
+		
+		cell->setToolTip(url);
+		std::string old_name = cell->getValue().asString();
+		if(old_name != name)
+		{
+			cell->setValue(name);
+		}
+		
+		LLColor4 cell_color = LLColor4::white;
+		U8 font_style = LLFontGL::NORMAL;
+		
+		// Focused
+		if (impl->hasFocus())
+		{
+			if (mDebugInfoVisible) cell_color = LLColor4::yellow;
+			media_class = MEDIA_CLASS_FOCUSED;
+		}
+		// Is attached to another avatar?
+		else if (impl->isAttachedToAnotherAvatar())
+		{
+			if (mDebugInfoVisible) cell_color = LLColor4::red;
+			media_class = MEDIA_CLASS_ON_OTHERS;
+		}
+		// Outside agent parcel
+		else if (!impl->isInAgentParcel())
+		{
+			if (mDebugInfoVisible) cell_color = LLColor4::orange;
+			media_class = MEDIA_CLASS_OUTSIDE_PARCEL;
+		}
+		else {
+			// inside parcel
+			media_class = MEDIA_CLASS_WITHIN_PARCEL;
+		}
+		if (impl->isMediaDisabled())
+		{
+			if (mDebugInfoVisible) font_style |= LLFontGL::ITALIC;
+			if (mDebugInfoVisible) cell_color = LLColor4::black;
+		}
+		// Dim it if it isn't "showing"
+		else if (!impl->hasMedia())
+		{
+			cell_color.setAlpha(0.25);
+		}
+		// Bold it if it is time-based media and it is playing
+		else if (impl->isMediaTimeBased() &&
+				 impl->isMediaPlaying())
+		{
+			if (mDebugInfoVisible) font_style |= LLFontGL::BOLD;
+		}
+		cell->setColor(cell_color);
+		LLScrollListText *text_cell = dynamic_cast<LLScrollListText*> (cell);
+		if (text_cell)
+		{
+			text_cell->setFontStyle(font_style);
+		}
+	}
+	
+	cell = item->getColumn(CLASS_COLUMN);
+	if(cell)
+	{
+		// TODO: clean this up!
+		cell->setValue(STRINGIZE(media_class));
+	}
+	
+	if(mDebugInfoVisible)
+	{
+		cell = item->getColumn(DEBUG_COLUMN);
+		if(cell)
+		{
+			std::string s;
+			
+			s += llformat("%g/", (float)impl->getInterest());
+
+			// proximity distance is actually distance squared -- display it as straight distance.
+			s += llformat("%g/", fsqrtf(impl->getProximityDistance()));
+
+//			s += llformat("%g/", (float)impl->getCPUUsage());
+//			s += llformat("%g/", (float)impl->getApproximateTextureInterest());
+			s += llformat("%g/", (float)(NULL == impl->getSomeObject()) ? 0.0 : impl->getSomeObject()->getPixelArea());
+			
+			s += LLPluginClassMedia::priorityToString(impl->getPriority());
+			
+			if(impl->hasMedia())
+			{
+				s += '@';
+			}
+			else if(impl->isPlayable())
+			{
+				s += '+';
+			}
+			else if(impl->isForcedUnloaded())
+			{
+				s += '!';
+			}
+				
+			cell->setValue(s);
+		}
+	}
+}
+
+void LLPanelNearByMedia::removeMediaItem(const LLUUID &id)
+{
+	if (NULL == mMediaList) return;
+	
+	mMediaList->deleteSingleItem(mMediaList->getItemIndex(id));
+}
+
+void LLPanelNearByMedia::refreshParcelMediaUI()
+{	
+	std::string url = LLViewerParcelMedia::getURL();
+	LLStyle::Params style_params;
+	if (url.empty())
+	{	
+		style_params.font.style = "ITALIC";
+		mParcelMediaText->setText(mDefaultParcelMediaName, style_params);
+		mParcelMediaText->setToolTip(mDefaultParcelMediaToolTip);	
+		mEnableParcelMediaCtrl->setEnabled(false);
+		mDisableParcelMediaCtrl->setEnabled(false);
+	}
+	else {
+		std::string name = LLViewerParcelMedia::getName();
+		if (name.empty()) name = url;
+		mParcelMediaText->setText(name, style_params);
+		mParcelMediaText->setToolTip(url);
+		mEnableParcelMediaCtrl->setEnabled(true);
+		mDisableParcelMediaCtrl->setEnabled(true);
+	}
+	
+	// Set up the default play controls state
+	mParcelMediaPauseCtrl->setEnabled(false);
+	mParcelMediaPauseCtrl->setVisible(false);
+	mParcelMediaPlayCtrl->setEnabled(true);
+	mParcelMediaPlayCtrl->setVisible(true);
+	mParcelMediaCtrl->setEnabled(false);
+	
+	if (LLViewerParcelMedia::getParcelMedia())
+	{
+		if (LLViewerParcelMedia::getParcelMedia()->getMediaPlugin() &&
+			LLViewerParcelMedia::getParcelMedia()->getMediaPlugin()->pluginSupportsMediaTime())
+		{
+			mParcelMediaCtrl->setEnabled(true);
+			
+			switch(LLViewerParcelMedia::getParcelMedia()->getMediaPlugin()->getStatus())
+			{
+				case LLPluginClassMediaOwner::MEDIA_PLAYING:
+					mParcelMediaPlayCtrl->setEnabled(false);
+					mParcelMediaPlayCtrl->setVisible(false);
+					mParcelMediaPauseCtrl->setEnabled(true);
+					mParcelMediaPauseCtrl->setVisible(true);
+					break;
+				case LLPluginClassMediaOwner::MEDIA_PAUSED:
+				default:
+					// default play status is kosher
+					break;
+			}
+		}
+	}
+}
+
+void LLPanelNearByMedia::refreshParcelAudioUI()
+{	
+	bool parcel_audio_enabled = !getParcelAudioURL().empty();
+
+	mParcelAudioCtrl->setToolTip(getParcelAudioURL());
+	
+	if (gAudiop && parcel_audio_enabled)
+	{
+		mParcelAudioCtrl->setEnabled(true);
+
+		if (PARCEL_AUDIO_PLAYING == gAudiop->isInternetStreamPlaying())
+		{
+			mParcelAudioPlayCtrl->setEnabled(false);
+			mParcelAudioPlayCtrl->setVisible(false);
+			mParcelAudioPauseCtrl->setEnabled(true);
+			mParcelAudioPauseCtrl->setVisible(true);
+		}
+		else {
+			mParcelAudioPlayCtrl->setEnabled(true);
+			mParcelAudioPlayCtrl->setVisible(true);
+			mParcelAudioPauseCtrl->setEnabled(false);
+			mParcelAudioPauseCtrl->setVisible(false);
+		}
+	}
+	else {
+		mParcelAudioCtrl->setEnabled(false);
+		mParcelAudioPlayCtrl->setEnabled(true);
+		mParcelAudioPlayCtrl->setVisible(true);
+		mParcelAudioPauseCtrl->setEnabled(false);
+		mParcelAudioPauseCtrl->setVisible(false);
+	}
+}
+
+void LLPanelNearByMedia::refreshList()
+{
+	bool all_items_deleted = false;
+		
+	if(!mMediaList)
+	{
+		// None of this makes any sense if the media list isn't there.
+		return;
+	}
+	
+	// Check whether the debug column has been shown/hidden.
+	bool debug_info_visible = gSavedSettings.getBOOL("MediaPerformanceManagerDebug");
+	if(debug_info_visible != mDebugInfoVisible)
+	{
+		mDebugInfoVisible = debug_info_visible;
+
+		// Clear all items so the list gets regenerated.
+		mMediaList->deleteAllItems();
+		all_items_deleted = true;
+		
+		updateColumns();
+	}
+	
+	// Get the canonical list from LLViewerMedia
+	LLViewerMedia::impl_list impls = LLViewerMedia::getPriorityList();
+	LLViewerMedia::impl_list::iterator priority_iter;
+	
+	// iterate over the impl list, creating rows as necessary.
+	for(priority_iter = impls.begin(); priority_iter != impls.end(); priority_iter++)
+	{
+		// If we just emptied out the list, every flag needs to be reset.
+		if(all_items_deleted)
+		{
+			(*priority_iter)->setInNearbyMediaList(false);
+		}
+		
+		if(! (*priority_iter)->isParcelMedia())
+		{
+			LLUUID media_id = (*priority_iter)->getMediaTextureID();
+			S32 proximity = (*priority_iter)->getProximity();
+			// This is expensive (i.e. a linear search) -- don't use it here.  We now use mInNearbyMediaList instead.
+//			S32 index = mMediaList->getItemIndex(media_id);
+
+			if(proximity < 0 || !shouldShow(*priority_iter))
+			{
+				// This isn't inworld media -- don't show it in the list.
+				if ((*priority_iter)->getInNearbyMediaList())
+				{
+					// There's a row for this impl -- remove it.
+					removeMediaItem(media_id);
+					(*priority_iter)->setInNearbyMediaList(false);
+				}
+			}
+			else
+			{
+				if (!(*priority_iter)->getInNearbyMediaList())
+				{
+					// We don't have a row for this impl -- add one.
+					addMediaItem(media_id);
+					(*priority_iter)->setInNearbyMediaList(true);
+				}
+			}
+		}
+	}
+	
+	int disabled_count = 0;
+	int enabled_count = 0;
+
+	// Iterate over the rows in the control, updating ones whose impl exists, and deleting ones whose impl has gone away.
+	std::vector<LLScrollListItem*> items = mMediaList->getAllData();
+
+	for (std::vector<LLScrollListItem*>::iterator item_it = items.begin();
+		item_it != items.end();
+		++item_it)
+	{
+		LLScrollListItem* item = (*item_it);
+		LLUUID row_id = item->getUUID();
+		
+		LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(row_id);
+		if(impl)
+		{
+			updateMediaItem(item, impl);
+			if(impl->isMediaDisabled())
+				disabled_count++;
+			else
+				enabled_count++;
+		}
+		else
+		{
+			// This item's impl has been deleted -- remove the row.
+			// Removing the row won't throw off our iteration, since we have a local copy of the array.
+			// We just need to make sure we don't access this item after the delete.
+			removeMediaItem(row_id);
+		}
+	}
+	mEnableAllCtrl->setEnabled(! LLViewerMedia::getInWorldMediaDisabled() && disabled_count > 0);
+	mDisableAllCtrl->setEnabled(! LLViewerMedia::getInWorldMediaDisabled() && enabled_count > 0);
+	
+	// Set the selection to whatever media impl the media focus/hover is on. 
+	// This is an experiment, and can be removed by ifdefing out these 4 lines.
+	LLUUID media_target = LLViewerMediaFocus::getInstance()->getControlsMediaID();
+	if(media_target.notNull())
+	{
+		mMediaList->selectByID(media_target);
+	}
+}
+
+void LLPanelNearByMedia::updateColumns()
+{
+	if (!mDebugInfoVisible)
+	{
+		mMediaList->getColumn(VISIBILITY_COLUMN)->setWidth(-1);
+		mMediaList->getColumn(PROXIMITY_COLUMN)->setWidth(-1);
+		mMediaList->getColumn(CLASS_COLUMN)->setWidth(-1);
+		mMediaList->getColumn(DEBUG_COLUMN)->setWidth(-1);
+	}
+	else {
+		mMediaList->getColumn(VISIBILITY_COLUMN)->setWidth(20);
+		mMediaList->getColumn(PROXIMITY_COLUMN)->setWidth(30);
+		mMediaList->getColumn(CLASS_COLUMN)->setWidth(20);
+		mMediaList->getColumn(DEBUG_COLUMN)->setWidth(200);
+	}
+}
+
+void LLPanelNearByMedia::onClickEnableAll()
+	{
+	enableAllHelper(true);
+	}
+
+void LLPanelNearByMedia::onClickDisableAll()
+{	
+	enableAllHelper(false);
+}
+
+void LLPanelNearByMedia::enableAllHelper(bool enabled)
+{	
+	bool disabled = !enabled;
+	
+	// Iterate over the rows in the control, setting the disable flag on the impl for each.
+	std::vector<LLScrollListItem*> items = mMediaList->getAllData();
+	
+	for (std::vector<LLScrollListItem*>::iterator item_it = items.begin();
+		 item_it != items.end();
+		 ++item_it)
+	{
+		setDisabled((*item_it)->getUUID(), disabled);
+	}
+	
+	// Now do the parcel media	
+	if (LLViewerParcelMedia::getParcelMedia())
+	{
+		LLViewerParcelMedia::getParcelMedia()->setDisabled(disabled);
+	}
+	
+	// And finally, parcel audio
+	if (disabled)
+	{
+		onClickParcelAudioStop();
+	}
+	else {
+		onClickParcelAudioPlay();
+	}
+	
+	// The hilight state of the control will be adjusted the next time through refreshList().
+}
+
+void LLPanelNearByMedia::onClickEnableParcelMedia()
+{	
+		LLViewerParcelMedia::play(LLViewerParcelMgr::getInstance()->getAgentParcel());
+	}
+
+void LLPanelNearByMedia::onClickDisableParcelMedia()
+{	
+		// This actually unloads the impl, as opposed to "stop"ping the media
+		LLViewerParcelMedia::stop();
+	}
+
+void LLPanelNearByMedia::onCheckItem(LLUICtrl* ctrl, const LLUUID &row_id)
+{	
+	LLCheckBoxCtrl* check = static_cast<LLCheckBoxCtrl*>(ctrl);
+
+	setDisabled(row_id, ! check->getValue());
+}
+
+bool LLPanelNearByMedia::setDisabled(const LLUUID &row_id, bool disabled)
+{
+	LLViewerMediaImpl* impl = LLViewerMedia::getMediaImplFromTextureID(row_id);
+	if(impl)
+	{
+		impl->setDisabled(disabled);
+		return true;
+	}
+	return false;
+}
+								
+//static
+void LLPanelNearByMedia::onZoomMedia(void* user_data)
+{
+	LLPanelNearByMedia* panelp = (LLPanelNearByMedia*)user_data;
+	LLUUID media_id = panelp->mMediaList->getValue().asUUID();
+	
+	LLViewerMediaFocus::getInstance()->focusZoomOnMedia(media_id);
+}
+
+void LLPanelNearByMedia::onClickMuteParcelMedia()
+{
+	if (LLViewerParcelMedia::getParcelMedia())
+	{
+		bool muted = mParcelMediaMuteCtrl->getValue();
+		LLViewerParcelMedia::getParcelMedia()->setVolume(muted ? (F32)0 : mParcelMediaVolumeSlider->getValueF32() );
+	}
+}
+
+void LLPanelNearByMedia::onParcelMediaVolumeSlider()
+{
+	if (LLViewerParcelMedia::getParcelMedia())
+	{
+		LLViewerParcelMedia::getParcelMedia()->setVolume(mParcelMediaVolumeSlider->getValueF32());
+	}
+}
+
+void LLPanelNearByMedia::onClickParcelMediaPlay()
+{
+	LLViewerParcelMedia::play(LLViewerParcelMgr::getInstance()->getAgentParcel());
+}
+
+void LLPanelNearByMedia::onClickParcelMediaStop()
+{	
+	if (LLViewerParcelMedia::getParcelMedia())
+	{
+		// This stops the media playing, as opposed to unloading it like
+		// LLViewerParcelMedia::stop() does
+		LLViewerParcelMedia::getParcelMedia()->stop();
+	}
+}
+
+void LLPanelNearByMedia::onClickParcelMediaPause()
+{
+	LLViewerParcelMedia::pause();
+}
+
+void LLPanelNearByMedia::onClickParcelAudioPlay()
+{
+	// User *explicitly* started the internet stream, so keep the stream
+	// playing and updated as they cross to other parcels etc.
+	mParcelAudioAutoStart = true;
+
+	if (!gAudiop)
+		return;
+
+	if (PARCEL_AUDIO_PAUSED == gAudiop->isInternetStreamPlaying())
+	{
+		// 'false' means unpause
+		gAudiop->pauseInternetStream(false);
+	}
+	else {
+		gAudiop->startInternetStream(getParcelAudioURL());
+	}
+}
+
+void LLPanelNearByMedia::onClickParcelAudioStop()
+{
+	// User *explicitly* stopped the internet stream, so don't
+	// re-start audio when i.e. they move to another parcel, until
+	// they explicitly start it again.
+	mParcelAudioAutoStart = false;
+
+	if (!gAudiop)
+		return;
+
+	gAudiop->stopInternetStream();
+}
+
+void LLPanelNearByMedia::onClickParcelAudioPause()
+{
+	if (!gAudiop)
+		return;
+
+	// 'true' means pause
+	gAudiop->pauseInternetStream(true);
+}
+
+bool LLPanelNearByMedia::shouldShow(LLViewerMediaImpl* impl)
+{	
+	const LLSD &choice_llsd = mShowCtrl->getSelectedValue();
+	MediaClass choice = (MediaClass)choice_llsd.asInteger();
+
+	switch (choice)
+	{	
+		case MEDIA_CLASS_ALL:
+			return true;
+			break;
+		case MEDIA_CLASS_WITHIN_PARCEL:
+			return impl->isInAgentParcel();
+			break;
+		case MEDIA_CLASS_OUTSIDE_PARCEL:
+			return ! impl->isInAgentParcel();
+			break;
+		case MEDIA_CLASS_ON_OTHERS:
+			return impl->isAttachedToAnotherAvatar();
+			break;
+		default:
+			break;
+	}
+	return true;
+}
+
+// static
+void LLPanelNearByMedia::getNameAndUrlHelper(LLViewerMediaImpl* impl, std::string& name, std::string & url, const std::string &defaultName)
+{
+	if (NULL == impl) return;
+	
+	name = impl->getName();
+	url = impl->getCurrentMediaURL();	// This is the URL the media impl actually has loaded
+	if (url.empty())
+	{
+		url = impl->getMediaEntryURL();	// This is the current URL from the media data
+	}
+	if (url.empty())
+	{
+		url = impl->getHomeURL();		// This is the home URL from the media data
+	}
+	if (name.empty())
+	{
+		name = url;
+	}
+	if (name.empty())
+	{
+		name = defaultName;
+	}
+}
+
+// static
+std::string LLPanelNearByMedia::getParcelAudioURL()
+{
+	return LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL();
+}
+
+
diff --git a/indra/newview/llpanelnearbymedia.h b/indra/newview/llpanelnearbymedia.h
new file mode 100644
index 0000000000..654e0980a6
--- /dev/null
+++ b/indra/newview/llpanelnearbymedia.h
@@ -0,0 +1,157 @@
+/** 
+ * @file llpanelnearbymedia.h
+ * @brief Management interface for muting and controlling nearby media
+ *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
+ * Copyright (c) 2005-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLPANELNEARBYMEDIA_H
+#define LL_LLPANELNEARBYMEDIA_H
+
+#include "llpanel.h"
+
+class LLPanelNearbyMedia;
+class LLButton;
+class LLScrollListCtrl;
+class LLSliderCtrl;
+class LLCheckBoxCtrl;
+class LLTextBox;
+class LLComboBox;
+class LLViewerMediaImpl;
+
+class LLPanelNearByMedia : public LLPanel
+{
+public:
+	
+	/*virtual*/ BOOL postBuild();
+	/*virtual*/ void draw();
+	/*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask);
+	/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
+	/*virtual*/ void handleVisibilityChange ( BOOL new_visibility );
+	/*virtual*/ void onTopLost ();
+
+	// this is part of the nearby media *dialog* so we can track whether
+	// the user *implicitly* wants audio on or off via their *explicit*
+	// interaction with our buttons.
+	bool getParcelAudioAutoStart();
+
+	LLPanelNearByMedia();
+	virtual ~LLPanelNearByMedia();
+
+private:
+	
+	enum ColumnIndex {
+		CHECKBOX_COLUMN = 0,
+		PROXIMITY_COLUMN = 1,
+		VISIBILITY_COLUMN = 2,
+		CLASS_COLUMN = 3,
+		NAME_COLUMN = 4,
+		DEBUG_COLUMN = 5
+	};
+	
+	// Media "class" enumeration
+	enum MediaClass {
+		MEDIA_CLASS_ALL = 0,
+		MEDIA_CLASS_FOCUSED = 1,
+		MEDIA_CLASS_WITHIN_PARCEL = 2,
+		MEDIA_CLASS_OUTSIDE_PARCEL = 3,
+		MEDIA_CLASS_ON_OTHERS = 4
+	};
+		
+	// Add/remove an LLViewerMediaImpl to/from the list
+	void addMediaItem(const LLUUID &id);
+	void updateMediaItem(LLScrollListItem* item, LLViewerMediaImpl* impl);
+	void removeMediaItem(const LLUUID &id);
+	
+	// Refresh the list in the UI
+	void refreshList();
+	
+	void refreshParcelMediaUI();
+	void refreshParcelAudioUI();
+
+	// UI Callbacks 
+	void onClickEnableAll();
+	void onClickDisableAll();
+	void onClickEnableParcelMedia();
+	void onClickDisableParcelMedia();
+	void onClickMuteParcelMedia();
+	void onParcelMediaVolumeSlider();
+	void onClickParcelMediaPlay();
+	void onClickParcelMediaStop();
+	void onClickParcelMediaPause();
+	void onClickParcelAudioPlay();
+	void onClickParcelAudioStop();
+	void onClickParcelAudioPause();
+	void onCheckAutoPlay();
+	
+	void onCheckItem(LLUICtrl* ctrl, const LLUUID &row_id);
+	
+	static void onZoomMedia(void* user_data);
+	
+private:
+	bool setDisabled(const LLUUID &id, bool disabled);
+	
+	static void getNameAndUrlHelper(LLViewerMediaImpl* impl, std::string& name, std::string & url, const std::string &defaultName);
+
+	static std::string getParcelAudioURL();
+	
+	void updateColumns();
+	
+	void enableAllHelper(bool val);
+
+	bool shouldShow(LLViewerMediaImpl* impl);
+	
+	LLScrollListCtrl*	mMediaList;
+	LLUICtrl*			mEnableAllCtrl;
+	LLUICtrl*			mDisableAllCtrl;
+	LLSliderCtrl*		mParcelMediaVolumeSlider;
+	LLButton*			mParcelMediaMuteCtrl;
+	LLUICtrl*			mEnableParcelMediaCtrl;
+	LLUICtrl*			mDisableParcelMediaCtrl;
+	LLTextBox*			mParcelMediaText;
+	LLTextBox*			mItemCountText;
+	LLUICtrl*			mParcelMediaCtrl;
+	LLUICtrl*			mParcelMediaPlayCtrl;
+	LLUICtrl*			mParcelMediaPauseCtrl;
+	LLUICtrl*			mParcelAudioCtrl;
+	LLUICtrl*			mParcelAudioPlayCtrl;
+	LLUICtrl*			mParcelAudioPauseCtrl;
+	LLComboBox*			mShowCtrl;
+	
+	bool				mAllMediaDisabled;
+	bool				mDebugInfoVisible;
+	bool				mParcelAudioAutoStart;
+	std::string			mEmptyNameString;
+	std::string			mDefaultParcelMediaName;
+	std::string			mDefaultParcelMediaToolTip;
+
+	LLFrameTimer		mHoverTimer;
+};
+
+
+#endif // LL_LLPANELNEARBYMEDIA_H
diff --git a/indra/newview/llpanelvolumepulldown.cpp b/indra/newview/llpanelvolumepulldown.cpp
index 74e37efe4e..247134ad63 100644
--- a/indra/newview/llpanelvolumepulldown.cpp
+++ b/indra/newview/llpanelvolumepulldown.cpp
@@ -96,7 +96,10 @@ void LLPanelVolumePulldown::handleVisibilityChange ( BOOL new_visibility )
 	else
 	{
 		mHoverTimer.stop();
-		gFocusMgr.setTopCtrl(NULL);
+		if (gFocusMgr.getTopCtrl() == this)
+		{
+			gFocusMgr.setTopCtrl(NULL);
+		}
 	}
 }
 
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index a2648e4c3a..64cb739bea 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -41,6 +41,7 @@
 #include "llviewercontrol.h"
 #include "llfloaterbuycurrency.h"
 #include "llfloaterlagmeter.h"
+#include "llpanelnearbymedia.h"
 #include "llpanelvolumepulldown.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterscriptdebug.h"
@@ -189,7 +190,7 @@ BOOL LLStatusBar::postBuild()
 	mBtnVolume->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterVolume, this));
 
 	LLButton* media_toggle = getChild<LLButton>("media_toggle_btn");
-	media_toggle->setMouseEnterCallback(boost::bind(&LLFloaterReg::showInstance, "nearby_media", LLSD(), true));
+	media_toggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this));
 
 	gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&LLStatusBar::onVolumeChanged, this, _2));
 
@@ -238,6 +239,9 @@ BOOL LLStatusBar::postBuild()
 	mPanelVolumePulldown = new LLPanelVolumePulldown();
 	addChild(mPanelVolumePulldown);
 
+	mPanelNearByMedia = new LLPanelNearByMedia();
+	addChild(mPanelNearByMedia);
+
 	LLRect volume_pulldown_rect = mPanelVolumePulldown->getRect();
 	LLButton* volbtn =  getChild<LLButton>( "volume_btn" );
 	volume_pulldown_rect.setLeftTopAndSize(volbtn->getRect().mLeft -
@@ -250,6 +254,21 @@ BOOL LLStatusBar::postBuild()
 	mPanelVolumePulldown->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
 	mPanelVolumePulldown->setVisible(FALSE);
 
+	LLRect nearby_media_rect = mPanelNearByMedia->getRect();
+	LLButton* nearby_media_btn =  getChild<LLButton>( "media_toggle_btn" );
+	nearby_media_rect.setLeftTopAndSize(nearby_media_btn->getRect().mLeft -
+	     (volume_pulldown_rect.getWidth() - nearby_media_btn->getRect().getWidth())/2,
+			       nearby_media_btn->calcScreenRect().mBottom,
+			       nearby_media_rect.getWidth(),
+			       nearby_media_rect.getHeight());
+	// force onscreen
+	nearby_media_rect.translate(getRect().getWidth() - nearby_media_rect.mRight, 0);
+
+	mPanelNearByMedia->setShape(nearby_media_rect);
+	mPanelNearByMedia->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
+	mPanelNearByMedia->setVisible(FALSE);
+	
+
 	return TRUE;
 }
 
@@ -511,13 +530,19 @@ static void onClickScriptDebug(void*)
 	LLFloaterScriptDebug::show(LLUUID::null);
 }
 
-//static
-void LLStatusBar::onMouseEnterVolume(LLUICtrl* ctrl)
+void LLStatusBar::onMouseEnterVolume()
+{
+	// show the master volume pull-down
+	mPanelVolumePulldown->setVisible(TRUE);
+}
+
+void LLStatusBar::onMouseEnterNearbyMedia()
 {
 	// show the master volume pull-down
-	gStatusBar->mPanelVolumePulldown->setVisible(TRUE);
+	mPanelNearByMedia->setVisible(TRUE);
 }
 
+
 static void onClickVolume(void* data)
 {
 	// toggle the master mute setting
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index 21a98dd753..d979f02bfd 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -48,6 +48,7 @@ class LLUUID;
 class LLFrameTimer;
 class LLStatGraph;
 class LLPanelVolumePulldown;
+class LLPanelNearByMedia;
 
 class LLStatusBar
 :	public LLPanel
@@ -87,6 +88,8 @@ public:
 	S32 getSquareMetersCommitted() const;
 	S32 getSquareMetersLeft() const;
 
+	LLPanelNearByMedia* getNearbyMediaPanel() { return mPanelNearByMedia; }
+
 private:
 	// simple method to setup the part that holds the date
 	void setupDate();
@@ -94,7 +97,8 @@ private:
 	void onClickBuyCurrency();
 	void onVolumeChanged(const LLSD& newvalue);
 
-	static void onMouseEnterVolume(LLUICtrl* ctrl);
+	void onMouseEnterVolume();
+	void onMouseEnterNearbyMedia();
 	static void onClickStatGraph(void* data);
 
 private:
@@ -113,6 +117,7 @@ private:
 	LLFrameTimer*	mBalanceTimer;
 	LLFrameTimer*	mHealthTimer;
 	LLPanelVolumePulldown* mPanelVolumePulldown;
+	LLPanelNearByMedia*	mPanelNearByMedia;
 	static std::vector<std::string> sDays;
 	static std::vector<std::string> sMonths;
 	static const U32 MAX_DATE_STRING_LENGTH;
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 29114c33c5..435636ceef 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -77,7 +77,6 @@
 #include "llfloatermap.h"
 #include "llfloatermemleak.h"
 #include "llfloaternamedesc.h"
-#include "llfloaternearbymedia.h"
 #include "llfloaternotificationsconsole.h"
 #include "llfloateropenobject.h"
 #include "llfloaterpay.h"
@@ -194,7 +193,6 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("mute_object_by_name", "floater_mute_object.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGetBlockedObjectName>);
 	LLFloaterReg::add("mini_map", "floater_map.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMap>);
 
-	LLFloaterReg::add("nearby_media", "floater_nearby_media.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNearbyMedia>);
 	LLFloaterReg::add("notifications_console", "floater_notifications_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNotificationConsole>);
 	LLFloaterReg::add("notification_well_window", "floater_sys_well.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLNotificationWellWindow>);
 
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index b6aaca8cfa..581a4ad2e4 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -385,7 +385,7 @@ private:
 	LLMimeDiscoveryResponder *mMimeTypeProbe;
 	bool mMediaAutoPlay;
 	std::string mMediaEntryURL;
-	bool mInNearbyMediaList;	// used by LLFloaterNearbyMedia::refreshList() for performance reasons
+	bool mInNearbyMediaList;	// used by LLPanelNearbyMedia::refreshList() for performance reasons
 	bool mClearCache;
 	LLColor4 mBackgroundColor;
 	bool mNavigateSuspended;
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 07c8867e26..0c0936c103 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -53,7 +53,7 @@
 //#include "llfirstuse.h"
 #include "llfloaterbuyland.h"
 #include "llfloatergroups.h"
-#include "llfloaternearbymedia.h"
+#include "llpanelnearbymedia.h"
 #include "llfloatersellland.h"
 #include "llfloatertools.h"
 #include "llparcelselection.h"
@@ -1795,11 +1795,11 @@ void optionally_start_music(const std::string& music_url)
 	{
 		// only play music when you enter a new parcel if the UI control for this
 		// was not *explicitly* stopped by the user. (part of SL-4878)
-		LLFloaterNearbyMedia *nearby_media_floater = LLFloaterReg::findTypedInstance<LLFloaterNearbyMedia>("nearby_media");
-		if ((nearby_media_floater &&
-		     nearby_media_floater->getParcelAudioAutoStart()) ||
+		LLPanelNearByMedia* nearby_media_panel = gStatusBar->getNearbyMediaPanel();;
+		if ((nearby_media_panel &&
+		     nearby_media_panel->getParcelAudioAutoStart()) ||
 		    // or they have expressed no opinion in the UI, but have autoplay on...
-		    (!nearby_media_floater &&
+		    (!nearby_media_panel &&
 		     gSavedSettings.getBOOL(LLViewerMedia::AUTO_PLAY_MEDIA_SETTING)))
 		{
 			llinfos << "Starting parcel music " << music_url << llendl;
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
new file mode 100644
index 0000000000..3ff0f127c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -0,0 +1,501 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+	can_resize="true"
+	can_close="false"
+	height="550"
+  background_opaque="true"
+  background_visible="true"
+	layout="topleft"
+	name="nearby_media"
+	help_topic="nearby_media"
+	width="440">
+  <string name="media_item_count_format">(%ld media items)</string>
+  <string name="empty_item_text">&lt;empty&gt;</string>
+  <string name="default_parcel_media_name">&lt;No Media Available&gt;</string>
+  <string name="default_parcel_media_tool_tip">Turn parcel media on/off</string>
+  <panel
+	  bottom="550"
+	  follows="left|top|right|bottom"
+	  left="0"
+	  mouse_opaque="false"
+	  name="nearby_media_panel"
+	  top="0">
+	<panel
+		bevel_style="in"
+		bg_alpha_color="0 0 0 0"
+		bg_opaque_color="0 0 0 0.3"
+		follows="left|right|top"
+		top="0"
+		height="45"
+		left="0">
+	  <text
+		  type="string"
+		  length="1"
+		  follows="top|left|right"
+		  font="SansSerifBold"
+		  left="10">
+		All Media
+	  </text>
+	  <text
+		  top_delta="0"
+		  type="string"
+		  length="1"
+		  follows="top|right"
+		  font="SansSerif"
+		  name="media_item_count"
+		  left="190">
+		(?? media items)
+	  </text> 
+	  <button
+		  name="all_nearby_media_enable_btn"
+		  top_delta="18"
+		  follows="left"
+		  tool_tip="Turn all nearby media on"
+		  left="15"
+		  width="28"
+		  height="22"
+		  label="On">
+		<button.commit_callback
+			function="MediaListCtrl.EnableAll" />
+	  </button>
+	  <button
+		  name="all_nearby_media_disable_btn"
+		  follows="left"
+		  tool_tip="Turn all nearby media off"
+		  left_pad="4"
+		  width="28"
+		  height="22"
+		  label="Off">
+		<button.commit_callback
+			function="MediaListCtrl.DisableAll" />
+	  </button>
+	  <slider
+		  height="15"
+		  top="27"
+		  left_delta="48"
+		  control_name="AudioLevelMedia"
+		  increment="0.05"
+		  initial_value="0.5"
+		  width="110"
+		  name="all_media_volume"
+		  show_text="false"
+		  volume="true">
+		<slider.commit_callback
+			function="Pref.setControlFalse"
+			parameter="MuteMedia" />
+	  </slider>
+	  <button
+		  control_name="MuteMedia"
+		  height="16"
+		  image_selected="AudioMute_Off"
+		  image_unselected="Audio_Off"
+		  is_toggle="true"
+		  left_delta="120"
+		  name="mute_all_media"
+		  tab_stop="false"
+		  top_delta="-1"
+		  width="18" />
+	</panel>
+	<!-- Parcel Media controls -->
+	<text
+		type="string"
+		length="1"
+		follows="left|top|right"
+		font="SansSerif"
+		font.size="Small"
+		top_pad="10"
+		left="40"
+		width="80">
+	  Parcel Media
+	</text>
+	<text
+		name="parcel_media_name"
+		use_ellipses="true"
+		type="string"
+		length="1"
+		follows="top|left|right"
+		font="SansSerif"
+		font.style="ITALIC"
+		font.size="Small"
+		left_pad="10"
+		right="-10">
+	  &lt;No Media Available&gt;
+	</text>
+<!--
+	<panel
+		bevel_style="in"
+		bg_alpha_color="0 0 0 0"
+		bg_opaque_color="0 0 0 0.3"
+		follows="left|top|right"
+		height="25"
+		left="25"
+		right="-10">
+	  <button
+		  name="parcel_media_enable_btn"
+		  follows="left"
+		  tool_tip="Turn parcel media on"
+		  left="15"
+		  width="28"
+		  height="22"
+		  label="On">
+		<button.commit_callback
+			function="ParcelMediaCtrl.EnableParcelMedia" />
+	  </button>
+	  <button
+		  name="parcel_media_disable_btn"
+		  follows="left"
+		  tool_tip="Turn parcel media off"
+		  left_pad="4"
+		  width="28"
+		  height="22"
+		  label="Off">
+		<button.commit_callback
+			function="ParcelMediaCtrl.DisableParcelMedia" />
+	  </button>
+	</panel>
+-->
+	<panel
+		name="parcel_media_ctrls"
+		bevel_style="in"
+		follows="left|top|right"
+		top_pad="2"
+		height="30"
+		left="0">
+	  <button
+		  name="parcel_media_play_btn"
+		  image_overlay="Play_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  tool_tip = "Play parcel media"
+		  left="40"
+		  height="22"
+		  min_width="22"
+		  width="22">
+		<button.commit_callback
+			function="ParcelMediaCtrl.Play" />
+	  </button>
+	  <button
+		  name="parcel_media_pause_btn"
+		  image_overlay="Pause_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  left_delta="0"
+		  height="22"
+		  tool_tip = "Pause parcel media">
+		<button.commit_callback
+			function="ParcelMediaCtrl.Pause" />
+	  </button>
+	  <button
+		  name="parcel_media_stop_btn"
+		  image_overlay="Stop_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  left_delta="25"
+		  height="22"
+		  tool_tip="Stop parcel media"
+		  min_width="22"
+		  width="22">
+		<button.commit_callback
+			function="ParcelMediaCtrl.Stop" />
+	  </button>
+	  <slider
+		  height="15"
+		  top="7"
+		  left="95"
+		  increment="0.05"
+		  initial_value="0.5"
+		  width="110"
+		  name="parcel_media_volume"
+		  show_text="false"
+		  volume="true">
+		<slider.commit_callback
+			function="ParcelMediaCtrl.ParcelMediaVolume"/>
+	  </slider>
+	  <button
+		  height="16"
+		  image_selected="AudioMute_Off"
+		  image_unselected="Audio_Off"
+		  is_toggle="true"
+		  left_delta="120"
+		  name="parcel_media_mute"
+		  tab_stop="false"
+		  top_delta="-1"
+		  width="18" >
+		<button.commit_callback
+			function="ParcelMediaCtrl.MuteParcelMedia" />
+	  </button>
+	</panel>
+	<!-- parcel audio -->
+	<panel
+		name="parcel_audio_ctrls"
+		bevel_style="in"
+		follows="left|top|right"
+		top_delta="30"
+		height="40"
+		left="0">
+	  <text
+		  type="string"
+		  length="1"
+		  top="0"
+		  follows="top|left|right"
+		  font="SansSerif"
+		  font.size="Small"
+		  left="40">
+		Parcel Audio
+	  </text>
+	  <button
+		  name="parcel_audio_play_btn"
+		  image_overlay="Play_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  tool_tip = "Play parcel audio"
+		  top="15"
+		  left="40"
+		  height="22"
+		  min_width="22"
+		  width="22">
+		<button.commit_callback
+			function="ParcelAudioCtrl.Play" />
+	  </button>
+	  <button
+		  name="parcel_audio_pause_btn"
+		  image_overlay="Pause_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  left_delta="0"
+		  height="22"
+		  tool_tip = "Pause parcel audio">
+		<button.commit_callback
+			function="ParcelAudioCtrl.Pause" />
+	  </button>
+	  <button
+		  name="parcel_audio_stop_btn"
+		  image_overlay="Stop_Off"
+		  image_disabled="PushButton_Disabled"
+		  image_disabled_selected="PushButton_Disabled"
+		  image_selected="PushButton_Selected"
+		  image_unselected="PushButton_Off"
+		  hover_glow_amount="0.15"
+		  left_delta="25"
+		  height="22"
+		  tool_tip="Stop parcel audio"
+		  min_width="22"
+		  width="22">
+		<button.commit_callback
+			function="ParcelAudioCtrl.Stop" />
+	  </button>
+	  <slider
+		  control_name="AudioLevelMusic"
+		  follows="left|top"
+		  height="15"
+		  increment="0.05"
+		  initial_value="0.5"
+		  left="95"
+		  width="110"
+		  name="Music Volume"
+		  show_text="false"
+		  top_delta="4"
+		  volume="true">
+		<slider.commit_callback
+			function="Pref.setControlFalse"
+			parameter="MuteMusic" />
+	  </slider>
+	  <button
+		  control_name="MuteMusic"
+		  height="16"
+		  image_selected="AudioMute_Off"
+		  image_unselected="Audio_Off"
+		  is_toggle="true"
+		  left_delta="120"
+		  name="mute_music"
+		  tab_stop="false"
+		  top_delta="-1"
+		  width="18" />
+	</panel>
+	<panel
+		bevel_style="in"
+		border_style="line"
+		bg_alpha_color="0 0 0 0"
+		bg_opaque_color="0 0 0 0.3"
+		follows="left|right|top|bottom"
+		top_delta="45"
+		right="-1"
+		left="0"
+		height="265">
+	  <text
+		  type="string"
+		  length="1"
+		  follows="top|left|right"
+		  font="SansSerifBold"
+		  left="10">
+		Nearby Media
+	  </text>
+	  <text
+		  type="string"
+		  length="1"
+		  follows="top|left|right"
+		  font="SansSerif"
+		  font.size="Small"
+		  font.style="ITALIC"
+		  top_pad="8"
+		  left="10">
+		Check to enable/disable media; double-click to zoom view
+	  </text>
+	  <text
+		  type="string"
+		  length="1"
+		  follows="top|left|right"
+		  font="SansSerif"
+		  top_pad="15"
+		  left="10">
+		Show:
+	  </text>
+	  <combo_box
+		  height="23"
+		  left="50"
+		  width="120"
+		  top_delta="-5"
+		  follows="left|right|top"
+		  name="show_combo">
+		<combo_box.item
+			label="All"
+			value="0"
+			name="All" />
+		<combo_box.item
+			label="In this Parcel"
+			value="2"
+			name="WithinParcel" />
+		<combo_box.item
+			label="Outside this Parcel"
+			value="3"
+			name="OutsideParcel" />
+		<combo_box.item
+			label="On other Avatars"
+			value="4"
+			ame="OnOthers" />
+	  </combo_box>
+	  <scroll_list
+		  follows="left|top|bottom|right"
+		  column_padding="0"
+		  height="200"
+		  draw_heading="false"
+		  draw_stripes="true"
+		  bg_stripe_color="0.25 0.25 0.25 0.25"
+		  top_pad="8"
+		  left="10"
+		  right="-10"
+		  name="media_list">
+		<scroll_list.columns
+			type="checkbox"
+			width="20"
+			label=""
+			name="media_checkbox_ctrl" />
+		<scroll_list.columns
+			sort_column="media_proximity"
+			width="-1"
+			label="Proximity"
+			name="media_proximity" />
+		<scroll_list.columns
+			sort_column="media_visibility"
+			width="-1"
+			label="Visible"
+			name="media_visibility" />
+		<scroll_list.columns
+			sort_column="media_class"
+			width="-1"
+			label="Class"
+			name="media_class" />
+		<scroll_list.columns
+			label="Name"
+			name="media_name" />
+		<scroll_list.columns
+			sort_column="media_debug"
+			width="-1"
+			label="Debug"
+			name="media_debug" />
+	  </scroll_list>
+	</panel>
+	<panel
+		bevel_style="in"
+		background_visible="true" 
+		bg_alpha_color="0.0 0.0 0.0 1.0"
+		bg_opaque_color="0 0 0 0.3"
+		follows="left|right|bottom"
+		top_pad="10"
+		height="110"
+		left="10"
+		right="-10">
+	  <check_box
+		  name="media_enabled_btn"
+		  control_name="AudioStreamingMedia"
+		  value="true"
+		  follows="left|bottom|right"
+		  height="15"
+		  tool_tip="Check this to enable all media"
+		  label="All Media Enabled"
+		  top="10"
+		  left="10"
+		  width="20"/>
+	  <check_box
+		  name="media_auto_play_btn"
+		  control_name="ParcelMediaAutoPlayEnable"
+		  enabled_control="AudioStreamingMedia"
+		  value="true"
+		  follows="left|bottom|right"
+		  height="15"
+		  tool_tip="Check this to let media auto-play if it wants"
+		  label="Allow Media to auto-play"
+		  top_pad="5"
+		  left="10"
+		  width="20"/>
+	  <check_box
+		  name="media_show_within_parcel_btn"
+		  control_name="MediaShowWithinParcel"
+		  enabled_control="AudioStreamingMedia"
+		  value="true"
+		  follows="left|bottom|right"
+		  height="15"
+		  tool_tip="Uncheck this to hide media within the parcel you are standing in"
+		  label="Show media within current parcel"
+		  left="10"
+		  width="20"/>
+	  <check_box
+		  name="media_show_outside_parcel_btn"
+		  control_name="MediaShowOutsideParcel"
+		  enabled_control="AudioStreamingMedia"
+		  value="true"
+		  follows="left|bottom|right"
+		  height="15"
+		  tool_tip="Uncheck this to hide media outside the parcel you are standing in"
+		  label="Show media outside current parcel"
+		  left="10"
+		  width="20"/>
+	  <check_box
+		  name="media_show_on_others_btn"
+		  control_name="MediaShowOnOthers"
+		  enabled_control="AudioStreamingMedia"
+		  value="true"
+		  follows="left|bottom|right"
+		  height="15"
+		  tool_tip="Uncheck this to hide media attached to other avatars nearby"
+		  label="Show media attached to other avatars"
+		  left="10"
+		  width="20"/>
+	</panel>
+  </panel>
+</panel>
-- 
cgit v1.3


From e159873eec4137b041fc8045f6d79ac6c21d2101 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 12 Feb 2010 16:54:47 -0800
Subject: added popup panel to hold nearby media popup and stopped using top
 view

---
 indra/llui/lltooltip.cpp                         |  6 ---
 indra/llui/lltooltip.h                           |  2 -
 indra/newview/llpanelnearbymedia.cpp             | 23 +++++++++---
 indra/newview/llrootview.h                       |  1 +
 indra/newview/llstatusbar.cpp                    | 47 ++++++++++++++++--------
 indra/newview/llstatusbar.h                      |  1 +
 indra/newview/llviewerwindow.cpp                 |  1 +
 indra/newview/skins/default/xui/en/main_view.xml |  6 +++
 8 files changed, 57 insertions(+), 30 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp
index 173fde8e76..ed7fd02e14 100644
--- a/indra/llui/lltooltip.cpp
+++ b/indra/llui/lltooltip.cpp
@@ -129,12 +129,6 @@ BOOL LLToolTipView::handleScrollWheel( S32 x, S32 y, S32 clicks )
 	return FALSE;
 }
 
-void LLToolTipView::onMouseLeave(S32 x, S32 y, MASK mask)
-{
-	LLToolTipMgr::instance().blockToolTips();
-}
-
-
 void LLToolTipView::drawStickyRect()
 {
 	gl_rect_2d(LLToolTipMgr::instance().getMouseNearRect(), LLColor4::white, false);
diff --git a/indra/llui/lltooltip.h b/indra/llui/lltooltip.h
index c0811c56c3..24e32b9b24 100644
--- a/indra/llui/lltooltip.h
+++ b/indra/llui/lltooltip.h
@@ -56,8 +56,6 @@ public:
 	/*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
 	/*virtual*/ BOOL handleScrollWheel( S32 x, S32 y, S32 clicks );
 
-	/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
-
 	void drawStickyRect();
 
 	/*virtual*/ void draw();
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
index 3480abcf40..9753fd9b54 100644
--- a/indra/newview/llpanelnearbymedia.cpp
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -184,22 +184,26 @@ void LLPanelNearByMedia::handleVisibilityChange ( BOOL new_visibility )
 	if (new_visibility)	
 	{
 		mHoverTimer.start(); // timer will be stopped when mouse hovers over panel
-		gFocusMgr.setTopCtrl(this);
+		//gFocusMgr.setTopCtrl(this);
 	}
 	else
 	{
 		mHoverTimer.stop();
-		if (gFocusMgr.getTopCtrl() == this)
-		{
-			gFocusMgr.setTopCtrl(NULL);
-		}
+		//if (gFocusMgr.getTopCtrl() == this)
+		//{
+		//	gFocusMgr.setTopCtrl(NULL);
+		//}
 	}
 }
 
 /*virtual*/ 
 void LLPanelNearByMedia::onTopLost ()
 {
-	setVisible(FALSE);
+	//LLUICtrl* new_top = gFocusMgr.getTopCtrl();
+	//if (!new_top || !new_top->hasAncestor(this))
+	//{
+	//	setVisible(FALSE);
+	//}
 }
 
 /*virtual*/
@@ -220,6 +224,13 @@ const F32 AUTO_CLOSE_FADE_TIME_END = 5.0f;
 
 void LLPanelNearByMedia::draw()
 {
+	//LLUICtrl* new_top = gFocusMgr.getTopCtrl();
+	//if (new_top != this)
+	//{
+	//	// reassert top ctrl
+	//	gFocusMgr.setTopCtrl(this);
+	//}
+
 	// keep bottom of panel on screen
 	LLRect screen_rect = calcScreenRect();
 	if (screen_rect.mBottom < 0)
diff --git a/indra/newview/llrootview.h b/indra/newview/llrootview.h
index 760b1a7a4c..38029e3a9d 100644
--- a/indra/newview/llrootview.h
+++ b/indra/newview/llrootview.h
@@ -35,6 +35,7 @@
 
 #include "llview.h"
 #include "lluictrlfactory.h"
+#include "lltooltip.h"
 
 class LLRootViewRegistry : public LLChildRegistry<LLRootViewRegistry>
 {};
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 025f03dc5a..5423b3e99f 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -50,6 +50,7 @@
 #include "llkeyboard.h"
 #include "lllineeditor.h"
 #include "llmenugl.h"
+#include "llrootview.h"
 #include "llsd.h"
 #include "lltextbox.h"
 #include "llui.h"
@@ -242,7 +243,11 @@ BOOL LLStatusBar::postBuild()
 	addChild(mPanelVolumePulldown);
 
 	mPanelNearByMedia = new LLPanelNearByMedia();
-	addChild(mPanelNearByMedia);
+	LLView* popup_holder = gViewerWindow->getRootView()->getChildView("popup_holder");
+	popup_holder->addChild(mPanelNearByMedia);
+	gViewerWindow->getRootView()->addMouseDownCallback(boost::bind(&LLStatusBar::onClickScreen, this, _1, _2));
+	mPanelNearByMedia->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
+	mPanelNearByMedia->setVisible(FALSE);
 
 	LLRect volume_pulldown_rect = mPanelVolumePulldown->getRect();
 	LLButton* volbtn =  getChild<LLButton>( "volume_btn" );
@@ -256,21 +261,6 @@ BOOL LLStatusBar::postBuild()
 	mPanelVolumePulldown->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
 	mPanelVolumePulldown->setVisible(FALSE);
 
-	LLRect nearby_media_rect = mPanelNearByMedia->getRect();
-	LLButton* nearby_media_btn =  getChild<LLButton>( "media_toggle_btn" );
-	nearby_media_rect.setLeftTopAndSize(nearby_media_btn->getRect().mLeft -
-	     (volume_pulldown_rect.getWidth() - nearby_media_btn->getRect().getWidth())/2,
-			       nearby_media_btn->calcScreenRect().mBottom,
-			       nearby_media_rect.getWidth(),
-			       nearby_media_rect.getHeight());
-	// force onscreen
-	nearby_media_rect.translate(getRect().getWidth() - nearby_media_rect.mRight, 0);
-
-	mPanelNearByMedia->setShape(nearby_media_rect);
-	mPanelNearByMedia->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
-	mPanelNearByMedia->setVisible(FALSE);
-	
-
 	return TRUE;
 }
 
@@ -542,7 +532,20 @@ void LLStatusBar::onMouseEnterVolume()
 
 void LLStatusBar::onMouseEnterNearbyMedia()
 {
+	LLView* popup_holder = gViewerWindow->getRootView()->getChildView("popup_holder");
+	LLRect nearby_media_rect = mPanelNearByMedia->getRect();
+	LLButton* nearby_media_btn =  getChild<LLButton>( "media_toggle_btn" );
+	LLRect nearby_media_btn_rect = nearby_media_btn->calcScreenRect();
+	nearby_media_rect.setLeftTopAndSize(nearby_media_btn_rect.mLeft - 
+		(nearby_media_rect.getWidth() - nearby_media_btn_rect.getWidth())/2,
+		nearby_media_btn_rect.mBottom,
+		nearby_media_rect.getWidth(),
+		nearby_media_rect.getHeight());
+	// force onscreen
+	nearby_media_rect.translate(popup_holder->getRect().getWidth() - nearby_media_rect.mRight, 0);
+
 	// show the master volume pull-down
+	mPanelNearByMedia->setShape(nearby_media_rect);
 	mPanelNearByMedia->setVisible(TRUE);
 }
 
@@ -631,6 +634,18 @@ void LLStatusBar::onClickStatGraph(void* data)
 	LLFloaterReg::showInstance("lagmeter");
 }
 
+void LLStatusBar::onClickScreen(S32 x, S32 y)
+{
+	if (mPanelNearByMedia->getVisible())
+	{
+		LLRect screen_rect = mPanelNearByMedia->calcScreenRect();
+		if (!screen_rect.pointInRect(x, y))
+		{
+			mPanelNearByMedia->setVisible(FALSE);
+		}
+	}
+}
+
 BOOL can_afford_transaction(S32 cost)
 {
 	return((cost <= 0)||((gStatusBar) && (gStatusBar->getBalance() >=cost)));
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index c37c27299f..e5240fcc3e 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -99,6 +99,7 @@ private:
 
 	void onMouseEnterVolume();
 	void onMouseEnterNearbyMedia();
+	void onClickScreen(S32 x, S32 y);
 	static void onClickStatGraph(void* data);
 
 	static void onClickMediaToggle(void* data);
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index b76a2e150f..f258be0397 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -982,6 +982,7 @@ void LLViewerWindow::handleMouseLeave(LLWindow *window)
 	// Note: we won't get this if we have captured the mouse.
 	llassert( gFocusMgr.getMouseCapture() == NULL );
 	mMouseInWindow = FALSE;
+	LLToolTipMgr::instance().blockToolTips();
 }
 
 BOOL LLViewerWindow::handleCloseRequest(LLWindow *window)
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index 1d4377e339..7b6081d7be 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -162,6 +162,12 @@
                mouse_opaque="false"
                name="Menu Holder"
                width="1024"/>
+  <panel top="0"
+         follows="all"
+         height="768"
+         mouse_opaque="false"
+         name="popup_holder"
+         width="1024"/>
   <snapshot_floater_view enabled="false"
                          follows="all"
                          height="768"
-- 
cgit v1.3


From af229a7bb0c891ec5d3e256e2509313c636973a3 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Fri, 12 Feb 2010 17:11:36 -0800
Subject: cast type F32 to GLint to eliminate some compiling warnings.

---
 indra/llui/llui.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 852a19660a..44a57a0989 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -710,19 +710,19 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
 
 			v = LLVector3(offset_x, offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop);
-			gGL.vertex2i(v.mV[0], v.mV[1] );
+			gGL.vertex2i((GLint)v.mV[0], (GLint)v.mV[1] );
 
 			v = LLVector3(-offset_x, offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop);
-			gGL.vertex2i(v.mV[0], v.mV[1] );
+			gGL.vertex2i((GLint)v.mV[0], (GLint)v.mV[1] );
 
 			v = LLVector3(-offset_x, -offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom);
-			gGL.vertex2i(v.mV[0], v.mV[1] );
+			gGL.vertex2i((GLint)v.mV[0], (GLint)v.mV[1] );
 
 			v = LLVector3(offset_x, -offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom);
-			gGL.vertex2i(v.mV[0], v.mV[1] );
+			gGL.vertex2i((GLint)v.mV[0], (GLint)v.mV[1] );
 		}
 		gGL.end();
 		gGL.popUIMatrix();
-- 
cgit v1.3


From 25be5a201fefed5653fca9ae348b10045b090c92 Mon Sep 17 00:00:00 2001
From: Palmer Truelson <palmer@lindenlab.com>
Date: Fri, 12 Feb 2010 21:02:25 -0800
Subject: Backed out bao's fix to FSAA that will also be backed out. changeset
 ae9bbbf181d9

---
 indra/llui/llui.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 44a57a0989..852a19660a 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -710,19 +710,19 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
 
 			v = LLVector3(offset_x, offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop);
-			gGL.vertex2i((GLint)v.mV[0], (GLint)v.mV[1] );
+			gGL.vertex2i(v.mV[0], v.mV[1] );
 
 			v = LLVector3(-offset_x, offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop);
-			gGL.vertex2i((GLint)v.mV[0], (GLint)v.mV[1] );
+			gGL.vertex2i(v.mV[0], v.mV[1] );
 
 			v = LLVector3(-offset_x, -offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom);
-			gGL.vertex2i((GLint)v.mV[0], (GLint)v.mV[1] );
+			gGL.vertex2i(v.mV[0], v.mV[1] );
 
 			v = LLVector3(offset_x, -offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom);
-			gGL.vertex2i((GLint)v.mV[0], (GLint)v.mV[1] );
+			gGL.vertex2i(v.mV[0], v.mV[1] );
 		}
 		gGL.end();
 		gGL.popUIMatrix();
-- 
cgit v1.3


From 651b14fcae01b089522f3672bbf35bfbe7268aac Mon Sep 17 00:00:00 2001
From: Palmer Truelson <palmer@lindenlab.com>
Date: Fri, 12 Feb 2010 21:04:51 -0800
Subject: Backed out davep's UI optimization. changeset 3134cb7bb181

---
 indra/llrender/llfontgl.cpp      |  30 +++++++----
 indra/llrender/llrender.cpp      | 106 ++----------------------------------
 indra/llrender/llrender.h        |  18 +------
 indra/llui/lltabcontainer.cpp    |  12 ++---
 indra/llui/llui.cpp              | 112 ++++++++++++++-------------------------
 indra/llui/llviewborder.cpp      |  58 ++++++++++++++++++++
 indra/llui/llviewborder.h        |   3 +-
 indra/newview/llhudrender.cpp    |  12 ++---
 indra/newview/llhudtext.cpp      |   2 +-
 indra/newview/llmediactrl.cpp    |   8 +--
 indra/newview/llnetmap.cpp       |  15 ------
 indra/newview/llviewerwindow.cpp |  14 +----
 12 files changed, 141 insertions(+), 249 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 129f3e7999..1de1d6ded4 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -151,16 +151,14 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 		}
 	}
 
-	gGL.pushUIMatrix();
-
-	gGL.loadUIIdentity();
-	
-	gGL.translateUI(floorf(sCurOrigin.mX*sScaleX), floorf(sCurOrigin.mY*sScaleY), sCurOrigin.mZ);
+	gGL.pushMatrix();
+	glLoadIdentity();
+	gGL.translatef(floorf(sCurOrigin.mX*sScaleX), floorf(sCurOrigin.mY*sScaleY), sCurOrigin.mZ);
 
 	// this code snaps the text origin to a pixel grid to start with
 	F32 pixel_offset_x = llround((F32)sCurOrigin.mX) - (sCurOrigin.mX);
 	F32 pixel_offset_y = llround((F32)sCurOrigin.mY) - (sCurOrigin.mY);
-	gGL.translateUI(-pixel_offset_x, -pixel_offset_y, 0.f);
+	gGL.translatef(-pixel_offset_x, -pixel_offset_y, 0.f);
 
 	LLFastTimer t(FTM_RENDER_FONTS);
 
@@ -248,6 +246,9 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 	}
 
 
+	// Remember last-used texture to avoid unnecesssary bind calls.
+	LLImageGL *last_bound_texture = NULL;
+
 	for (i = begin_offset; i < begin_offset + length; i++)
 	{
 		llwchar wch = wstr[i];
@@ -260,8 +261,12 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 		}
 		// Per-glyph bitmap texture.
 		LLImageGL *image_gl = mFontFreetype->getFontBitmapCache()->getImageGL(fgi->mBitmapNum);
-		gGL.getTexUnit(0)->bind(image_gl);
-	
+		if (last_bound_texture != image_gl)
+		{
+			gGL.getTexUnit(0)->bind(image_gl);
+			last_bound_texture = image_gl;
+		}
+
 		if ((start_x + scaled_max_pixels) < (cur_x + fgi->mXBearing + fgi->mWidth))
 		{
 			// Not enough room for this character.
@@ -325,7 +330,10 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 		
 		// recursively render ellipses at end of string
 		// we've already reserved enough room
-		gGL.pushUIMatrix();
+		gGL.pushMatrix();
+		//glLoadIdentity();
+		//gGL.translatef(sCurOrigin.mX, sCurOrigin.mY, 0.0f);
+		//glScalef(sScaleX, sScaleY, 1.f);
 		renderUTF8(std::string("..."), 
 				0,
 				cur_x / sScaleX, (F32)y,
@@ -336,10 +344,10 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 				S32_MAX, max_pixels,
 				right_x,
 				FALSE); 
-		gGL.popUIMatrix();
+		gGL.popMatrix();
 	}
 
-	gGL.popUIMatrix();
+	gGL.popMatrix();
 
 	return chars_drawn;
 }
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index cde60b7e25..f97d81126e 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -49,9 +49,6 @@ F64 gGLLastProjection[16];
 F64 gGLProjection[16];
 S32	gGLViewport[4];
 
-U32 LLRender::sUICalls = 0;
-U32 LLRender::sUIVerts = 0;
-
 static const U32 LL_NUM_TEXTURE_LAYERS = 16; 
 
 static GLenum sGLTextureType[] =
@@ -258,9 +255,10 @@ bool LLTexUnit::bind(LLImageGL* texture, bool for_rendering, bool forceBind)
 		return false ;
 	}
 
+	gGL.flush();
+
 	if ((mCurrTexture != texture->getTexName()) || forceBind)
 	{
-		gGL.flush();
 		activate();
 		enable(texture->getTarget());
 		mCurrTexture = texture->getTexName();
@@ -447,8 +445,6 @@ void LLTexUnit::setTextureBlendType(eTextureBlendType type)
 		return;
 	}
 
-	gGL.flush();
-
 	activate();
 	mCurrBlendType = type;
 	S32 scale_amount = 1;
@@ -760,7 +756,6 @@ LLRender::LLRender()
 
 	mCurrAlphaFunc = CF_DEFAULT;
 	mCurrAlphaFuncVal = 0.01f;
-	mCurrSceneBlendType = BT_ALPHA;
 }
 
 LLRender::~LLRender()
@@ -823,80 +818,6 @@ void LLRender::popMatrix()
 	glPopMatrix();
 }
 
-void LLRender::translateUI(F32 x, F32 y, F32 z)
-{
-	if (mUIOffset.empty())
-	{
-		llerrs << "Need to push a UI translation frame before offsetting" << llendl;
-	}
-
-	mUIOffset.front().mV[0] += x;
-	mUIOffset.front().mV[1] += y;
-	mUIOffset.front().mV[2] += z;
-}
-
-void LLRender::scaleUI(F32 x, F32 y, F32 z)
-{
-	if (mUIScale.empty())
-	{
-		llerrs << "Need to push a UI transformation frame before scaling." << llendl;
-	}
-
-	mUIScale.front().scaleVec(LLVector3(x,y,z));
-}
-
-void LLRender::pushUIMatrix()
-{
-	mUIOffset.push_front(mUIOffset.front());
-	if (mUIScale.empty())
-	{
-		mUIScale.push_front(LLVector3(1,1,1));
-	}
-	else
-	{
-		mUIScale.push_front(mUIScale.front());
-	}
-}
-
-void LLRender::popUIMatrix()
-{
-	if (mUIOffset.empty())
-	{
-		llerrs << "UI offset stack blown." << llendl;
-	}
-	mUIOffset.pop_front();
-	mUIScale.pop_front();
-}
-
-LLVector3 LLRender::getUITranslation()
-{
-	if (mUIOffset.empty())
-	{
-		llerrs << "UI offset stack empty." << llendl;
-	}
-	return mUIOffset.front();
-}
-
-LLVector3 LLRender::getUIScale()
-{
-	if (mUIScale.empty())
-	{
-		llerrs << "UI scale stack empty." << llendl;
-	}
-	return mUIScale.front();
-}
-
-
-void LLRender::loadUIIdentity()
-{
-	if (mUIOffset.empty())
-	{
-		llerrs << "Need to push UI translation frame before clearing offset." << llendl;
-	}
-	mUIOffset.front().setVec(0,0,0);
-	mUIScale.front().setVec(1,1,1);
-}
-
 void LLRender::setColorMask(bool writeColor, bool writeAlpha)
 {
 	setColorMask(writeColor, writeColor, writeColor, writeAlpha);
@@ -919,11 +840,6 @@ void LLRender::setColorMask(bool writeColorR, bool writeColorG, bool writeColorB
 
 void LLRender::setSceneBlendType(eBlendType type)
 {
-	if (mCurrSceneBlendType == type)
-	{
-		return;
-	}
-
 	flush();
 	switch (type) 
 	{
@@ -952,7 +868,6 @@ void LLRender::setSceneBlendType(eBlendType type)
 			llerrs << "Unknown Scene Blend Type: " << type << llendl;
 			break;
 	}
-	mCurrSceneBlendType = type;
 }
 
 void LLRender::setAlphaRejectSettings(eCompareFunc func, F32 value)
@@ -1094,12 +1009,6 @@ void LLRender::flush()
 		}
 #endif
 				
-		if (!mUIOffset.empty())
-		{
-			sUICalls++;
-			sUIVerts += mCount;
-		}
-
 		mBuffer->setBuffer(immediate_mask);
 		mBuffer->drawArrays(mMode, 0, mCount);
 		
@@ -1119,16 +1028,7 @@ void LLRender::vertex3f(const GLfloat& x, const GLfloat& y, const GLfloat& z)
 		return;
 	}
 
-	if (mUIOffset.empty())
-	{
-		mVerticesp[mCount] = LLVector3(x,y,z);
-	}
-	else
-	{
-		LLVector3 vert = (LLVector3(x,y,z)+mUIOffset.front()).scaledVec(mUIScale.front());
-		mVerticesp[mCount] = vert;
-	}
-
+	mVerticesp[mCount] = LLVector3(x,y,z);
 	mCount++;
 	if (mCount < 4096)
 	{
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 6e38fac67b..0121a190ee 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -286,14 +286,6 @@ public:
 	void pushMatrix();
 	void popMatrix();
 
-	void translateUI(F32 x, F32 y, F32 z);
-	void scaleUI(F32 x, F32 y, F32 z);
-	void pushUIMatrix();
-	void popUIMatrix();
-	void loadUIIdentity();
-	LLVector3 getUITranslation();
-	LLVector3 getUIScale();
-
 	void flush();
 
 	void begin(const GLuint& mode);
@@ -341,9 +333,7 @@ public:
 	};
 
 public:
-	static U32 sUICalls;
-	static U32 sUIVerts;
-	
+
 private:
 	bool				mDirty;
 	U32				mCount;
@@ -360,13 +350,7 @@ private:
 	std::vector<LLTexUnit*>		mTexUnits;
 	LLTexUnit*			mDummyTexUnit;
 
-	U32				mCurrSceneBlendType;
-
 	F32				mMaxAnisotropy;
-
-	std::list<LLVector3> mUIOffset;
-	std::list<LLVector3> mUIScale;
-
 };
 
 extern F64 gGLModelView[16];
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index f11bc2173c..6be76605fd 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -402,15 +402,15 @@ void LLTabContainer::draw()
 		if( mIsVertical && has_scroll_arrows )
 		{
 			// Redraw the arrows so that they appears on top.
-			gGL.pushUIMatrix();
-			gGL.translateUI((F32)mPrevArrowBtn->getRect().mLeft, (F32)mPrevArrowBtn->getRect().mBottom, 0.f);
+			gGL.pushMatrix();
+			gGL.translatef((F32)mPrevArrowBtn->getRect().mLeft, (F32)mPrevArrowBtn->getRect().mBottom, 0.f);
 			mPrevArrowBtn->draw();
-			gGL.popUIMatrix();
+			gGL.popMatrix();
 
-			gGL.pushUIMatrix();
-			gGL.translateUI((F32)mNextArrowBtn->getRect().mLeft, (F32)mNextArrowBtn->getRect().mBottom, 0.f);
+			gGL.pushMatrix();
+			gGL.translatef((F32)mNextArrowBtn->getRect().mLeft, (F32)mNextArrowBtn->getRect().mBottom, 0.f);
 			mNextArrowBtn->draw();
-			gGL.popUIMatrix();
+			gGL.popMatrix();
 		}
 	}
 
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 0e2e8bf8ed..d0ed3b6fca 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -39,7 +39,6 @@
 
 // Linden library includes
 #include "v2math.h"
-#include "m3math.h"
 #include "v4color.h"
 #include "llrender.h"
 #include "llrect.h"
@@ -181,19 +180,19 @@ void gl_rect_2d_offset_local( S32 left, S32 top, S32 right, S32 bottom, const LL
 
 void gl_rect_2d_offset_local( S32 left, S32 top, S32 right, S32 bottom, S32 pixel_offset, BOOL filled)
 {
-	gGL.pushUIMatrix();
+	gGL.pushMatrix();
 	left += LLFontGL::sCurOrigin.mX;
 	right += LLFontGL::sCurOrigin.mX;
 	bottom += LLFontGL::sCurOrigin.mY;
 	top += LLFontGL::sCurOrigin.mY;
 
-	gGL.loadUIIdentity();
+	glLoadIdentity();
 	gl_rect_2d(llfloor((F32)left * LLUI::sGLScaleFactor.mV[VX]) - pixel_offset,
 				llfloor((F32)top * LLUI::sGLScaleFactor.mV[VY]) + pixel_offset,
 				llfloor((F32)right * LLUI::sGLScaleFactor.mV[VX]) + pixel_offset,
 				llfloor((F32)bottom * LLUI::sGLScaleFactor.mV[VY]) - pixel_offset,
 				filled);
-	gGL.popUIMatrix();
+	gGL.popMatrix();
 }
 
 
@@ -509,9 +508,9 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLTex
 		gGL.getTexUnit(0)->setTextureAlphaBlend(LLTexUnit::TBO_MULT, LLTexUnit::TBS_TEX_ALPHA, LLTexUnit::TBS_VERT_ALPHA);
 	}
 
-	gGL.pushUIMatrix();
+	gGL.pushMatrix();
 	{
-		gGL.translateUI((F32)x, (F32)y, 0.f);
+		gGL.translatef((F32)x, (F32)y, 0.f);
 
 		gGL.getTexUnit(0)->bind(image);
 
@@ -638,7 +637,7 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLTex
 		}
 		gGL.end();
 	}
-	gGL.popUIMatrix();
+	gGL.popMatrix();
 
 	if (solid_color)
 	{
@@ -661,72 +660,39 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
 
 	LLGLSUIDefault gls_ui;
 
-
-	gGL.getTexUnit(0)->bind(image);
-
-	gGL.color4fv(color.mV);
-
-	if (degrees == 0.f)
+	gGL.pushMatrix();
 	{
-		gGL.pushUIMatrix();
-		gGL.translateUI((F32)x, (F32)y, 0.f);
-			
-		gGL.begin(LLRender::QUADS);
+		gGL.translatef((F32)x, (F32)y, 0.f);
+		if( degrees )
 		{
-			gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop);
-			gGL.vertex2i(width, height );
-
-			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop);
-			gGL.vertex2i(0, height );
-
-			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom);
-			gGL.vertex2i(0, 0);
-
-			gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom);
-			gGL.vertex2i(width, 0);
+			F32 offset_x = F32(width/2);
+			F32 offset_y = F32(height/2);
+			gGL.translatef( offset_x, offset_y, 0.f);
+			glRotatef( degrees, 0.f, 0.f, 1.f );
+			gGL.translatef( -offset_x, -offset_y, 0.f );
 		}
-		gGL.end();
-		gGL.popUIMatrix();
-	}
-	else
-	{
-		gGL.pushUIMatrix();
-		gGL.translateUI((F32)x, (F32)y, 0.f);
-	
-		F32 offset_x = F32(width/2);
-		F32 offset_y = F32(height/2);
-
-		gGL.translateUI(offset_x, offset_y, 0.f);
 
-		LLMatrix3 quat(0.f, 0.f, degrees*DEG_TO_RAD);
-		
 		gGL.getTexUnit(0)->bind(image);
 
 		gGL.color4fv(color.mV);
 		
 		gGL.begin(LLRender::QUADS);
 		{
-			LLVector3 v;
-
-			v = LLVector3(offset_x, offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop);
-			gGL.vertex2i(v.mV[0], v.mV[1] );
+			gGL.vertex2i(width, height );
 
-			v = LLVector3(-offset_x, offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop);
-			gGL.vertex2i(v.mV[0], v.mV[1] );
+			gGL.vertex2i(0, height );
 
-			v = LLVector3(-offset_x, -offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom);
-			gGL.vertex2i(v.mV[0], v.mV[1] );
+			gGL.vertex2i(0, 0);
 
-			v = LLVector3(offset_x, -offset_y, 0.f) * quat;
 			gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom);
-			gGL.vertex2i(v.mV[0], v.mV[1] );
+			gGL.vertex2i(width, 0);
 		}
 		gGL.end();
-		gGL.popUIMatrix();
 	}
+	gGL.popMatrix();
 }
 
 
@@ -781,9 +747,9 @@ void gl_arc_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled, F
 		end_angle += F_TWO_PI;
 	}
 
-	gGL.pushUIMatrix();
+	gGL.pushMatrix();
 	{
-		gGL.translateUI(center_x, center_y, 0.f);
+		gGL.translatef(center_x, center_y, 0.f);
 
 		// Inexact, but reasonably fast.
 		F32 delta = (end_angle - start_angle) / steps;
@@ -814,15 +780,15 @@ void gl_arc_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled, F
 		}
 		gGL.end();
 	}
-	gGL.popUIMatrix();
+	gGL.popMatrix();
 }
 
 void gl_circle_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled)
 {
-	gGL.pushUIMatrix();
+	gGL.pushMatrix();
 	{
 		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-		gGL.translateUI(center_x, center_y, 0.f);
+		gGL.translatef(center_x, center_y, 0.f);
 
 		// Inexact, but reasonably fast.
 		F32 delta = F_TWO_PI / steps;
@@ -853,7 +819,7 @@ void gl_circle_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled
 		}
 		gGL.end();
 	}
-	gGL.popUIMatrix();
+	gGL.popMatrix();
 }
 
 // Renders a ring with sides (tube shape)
@@ -880,9 +846,9 @@ void gl_deep_circle( F32 radius, F32 depth, S32 steps )
 
 void gl_ring( F32 radius, F32 width, const LLColor4& center_color, const LLColor4& side_color, S32 steps, BOOL render_center )
 {
-	gGL.pushUIMatrix();
+	gGL.pushMatrix();
 	{
-		gGL.translateUI(0.f, 0.f, -width / 2);
+		gGL.translatef(0.f, 0.f, -width / 2);
 		if( render_center )
 		{
 			gGL.color4fv(center_color.mV);
@@ -891,11 +857,11 @@ void gl_ring( F32 radius, F32 width, const LLColor4& center_color, const LLColor
 		else
 		{
 			gl_washer_2d(radius, radius - width, steps, side_color, side_color);
-			gGL.translateUI(0.f, 0.f, width);
+			gGL.translatef(0.f, 0.f, width);
 			gl_washer_2d(radius - width, radius, steps, side_color, side_color);
 		}
 	}
-	gGL.popUIMatrix();
+	gGL.popMatrix();
 }
 
 // Draw gray and white checkerboard with black border
@@ -1084,9 +1050,9 @@ void gl_segmented_rect_2d_tex(const S32 left,
 	S32 width = llabs(right - left);
 	S32 height = llabs(top - bottom);
 
-	gGL.pushUIMatrix();
+	gGL.pushMatrix();
 
-	gGL.translateUI((F32)left, (F32)bottom, 0.f);
+	gGL.translatef((F32)left, (F32)bottom, 0.f);
 	LLVector2 border_uv_scale((F32)border_size / (F32)texture_width, (F32)border_size / (F32)texture_height);
 
 	if (border_uv_scale.mV[VX] > 0.5f)
@@ -1227,7 +1193,7 @@ void gl_segmented_rect_2d_tex(const S32 left,
 	}
 	gGL.end();
 
-	gGL.popUIMatrix();
+	gGL.popMatrix();
 }
 
 void gl_segmented_rect_2d_fragment_tex(const S32 left, 
@@ -1244,9 +1210,9 @@ void gl_segmented_rect_2d_fragment_tex(const S32 left,
 	S32 width = llabs(right - left);
 	S32 height = llabs(top - bottom);
 
-	gGL.pushUIMatrix();
+	gGL.pushMatrix();
 
-	gGL.translateUI((F32)left, (F32)bottom, 0.f);
+	gGL.translatef((F32)left, (F32)bottom, 0.f);
 	LLVector2 border_uv_scale((F32)border_size / (F32)texture_width, (F32)border_size / (F32)texture_height);
 
 	if (border_uv_scale.mV[VX] > 0.5f)
@@ -1417,7 +1383,7 @@ void gl_segmented_rect_2d_fragment_tex(const S32 left,
 	}
 	gGL.end();
 
-	gGL.popUIMatrix();
+	gGL.popMatrix();
 }
 
 void gl_segmented_rect_3d_tex(const LLVector2& border_scale, const LLVector3& border_width, 
@@ -1625,7 +1591,7 @@ void LLUI::dirtyRect(LLRect rect)
 //static
 void LLUI::translate(F32 x, F32 y, F32 z)
 {
-	gGL.translateUI(x,y,z);
+	gGL.translatef(x,y,z);
 	LLFontGL::sCurOrigin.mX += (S32) x;
 	LLFontGL::sCurOrigin.mY += (S32) y;
 	LLFontGL::sCurOrigin.mZ += z;
@@ -1634,14 +1600,14 @@ void LLUI::translate(F32 x, F32 y, F32 z)
 //static
 void LLUI::pushMatrix()
 {
-	gGL.pushUIMatrix();
+	gGL.pushMatrix();
 	LLFontGL::sOriginStack.push_back(LLFontGL::sCurOrigin);
 }
 
 //static
 void LLUI::popMatrix()
 {
-	gGL.popUIMatrix();
+	gGL.popMatrix();
 	LLFontGL::sCurOrigin = *LLFontGL::sOriginStack.rbegin();
 	LLFontGL::sOriginStack.pop_back();
 }
@@ -1649,7 +1615,7 @@ void LLUI::popMatrix()
 //static 
 void LLUI::loadIdentity()
 {
-	gGL.loadUIIdentity(); 
+	glLoadIdentity();
 	LLFontGL::sCurOrigin.mX = 0;
 	LLFontGL::sCurOrigin.mY = 0;
 	LLFontGL::sCurOrigin.mZ = 0;
diff --git a/indra/llui/llviewborder.cpp b/indra/llui/llviewborder.cpp
index bd9c43c97f..30717f87de 100644
--- a/indra/llui/llviewborder.cpp
+++ b/indra/llui/llviewborder.cpp
@@ -125,6 +125,14 @@ void LLViewBorder::draw()
 			llassert( FALSE );  // not implemented
 		}
 	}
+	else
+	if( STYLE_TEXTURE == mStyle )
+	{
+		if( mTexture )
+		{
+			drawTextures();
+		}
+	}
 
 	LLView::draw();
 }
@@ -247,6 +255,56 @@ void LLViewBorder::drawTwoPixelLines()
 	gl_line_2d(left+1, bottom+1, right-1, bottom+1);
 }
 
+void LLViewBorder::drawTextures()
+{
+	//LLGLSUIDefault gls_ui;
+
+	//llassert( FALSE );  // TODO: finish implementing
+
+	//gGL.color4fv(UI_VERTEX_COLOR.mV);
+
+	//gGL.getTexUnit(0)->bind(mTexture);
+	//gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_WRAP);
+
+	//drawTextureTrapezoid(   0.f, mBorderWidth, getRect().getWidth(),  0,					0 );
+	//drawTextureTrapezoid(  90.f, mBorderWidth, getRect().getHeight(), (F32)getRect().getWidth(),0 );
+	//drawTextureTrapezoid( 180.f, mBorderWidth, getRect().getWidth(),  (F32)getRect().getWidth(),(F32)getRect().getHeight() );
+	//drawTextureTrapezoid( 270.f, mBorderWidth, getRect().getHeight(), 0,					(F32)getRect().getHeight() );
+}
+
+
+void LLViewBorder::drawTextureTrapezoid( F32 degrees, S32 width, S32 length, F32 start_x, F32 start_y )
+{
+	gGL.pushMatrix();
+	{
+		gGL.translatef(start_x, start_y, 0.f);
+		glRotatef( degrees, 0, 0, 1 );
+
+		gGL.begin(LLRender::QUADS);
+		{
+			//      width, width   /---------\ length-width, width		//
+			//	   			      /           \							//
+			//				     /			   \						//
+			//				    /---------------\						//
+			//    			0,0					  length, 0				//
+
+			gGL.texCoord2f( 0, 0 );
+			gGL.vertex2i( 0, 0 );
+
+			gGL.texCoord2f( (GLfloat)length, 0 );
+			gGL.vertex2i( length, 0 );
+
+			gGL.texCoord2f( (GLfloat)(length - width), (GLfloat)width );
+			gGL.vertex2i( length - width, width );
+
+			gGL.texCoord2f( (GLfloat)width, (GLfloat)width );
+			gGL.vertex2i( width, width );
+		}
+		gGL.end();
+	}
+	gGL.popMatrix();
+}
+
 BOOL LLViewBorder::getBevelFromAttribute(LLXMLNodePtr node, LLViewBorder::EBevel& bevel_style)
 {
 	if (node->hasAttribute("bevel_style"))
diff --git a/indra/llui/llviewborder.h b/indra/llui/llviewborder.h
index 342e84fd93..92fd569325 100644
--- a/indra/llui/llviewborder.h
+++ b/indra/llui/llviewborder.h
@@ -99,7 +99,8 @@ private:
 	void		drawOnePixelLines();
 	void		drawTwoPixelLines();
 	void		drawTextures();
-	
+	void		drawTextureTrapezoid( F32 degrees, S32 width, S32 length, F32 start_x, F32 start_y );
+
 	EBevel		mBevel;
 	EStyle		mStyle;
 	LLUIColor	mHighlightLight;
diff --git a/indra/newview/llhudrender.cpp b/indra/newview/llhudrender.cpp
index 325c9c260c..a02dc3355b 100644
--- a/indra/newview/llhudrender.cpp
+++ b/indra/newview/llhudrender.cpp
@@ -121,24 +121,24 @@ void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent,
 	glMatrixMode(GL_PROJECTION);
 	glPushMatrix();
 	glMatrixMode(GL_MODELVIEW);
-	gGL.pushMatrix();
+	
 	LLUI::pushMatrix();
 		
 	gl_state_for_2d(world_view_rect.getWidth(), world_view_rect.getHeight());
 	gViewerWindow->setup3DViewport();
-	
+	//gViewerWindow->setup2DRender();
+
 	winX -= world_view_rect.mLeft;
 	winY -= world_view_rect.mBottom;
 	LLUI::loadIdentity();
-	glLoadIdentity();
 	LLUI::translate((F32) winX*1.0f/LLFontGL::sScaleX, (F32) winY*1.0f/(LLFontGL::sScaleY), -(((F32) winZ*2.f)-1.f));
+	//glRotatef(angle * RAD_TO_DEG, axis.mV[VX], axis.mV[VY], axis.mV[VZ]);
+	//glScalef(right_scale, up_scale, 1.f);
 	F32 right_x;
 	
 	font.render(wstr, 0, 0, 0, color, LLFontGL::LEFT, LLFontGL::BASELINE, style, shadow, wstr.length(), 1000, &right_x);
-
 	LLUI::popMatrix();
-	gGL.popMatrix();
-
+	
 	glMatrixMode(GL_PROJECTION);
 	glPopMatrix();
 	glMatrixMode(GL_MODELVIEW);
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
index 8d1d27444b..8ad94b957d 100644
--- a/indra/newview/llhudtext.cpp
+++ b/indra/newview/llhudtext.cpp
@@ -555,7 +555,7 @@ void LLHUDText::renderText(BOOL for_select)
 		}
 	}
 	/// Reset the default color to white.  The renderer expects this to be the default. 
-	gGL.color4f(1.0f, 1.0f, 1.0f, 1.0f);
+	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
 	if (for_select)
 	{
 		gGL.getTexUnit(0)->enable(LLTexUnit::TT_TEXTURE);
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 6fd6958d2e..d464862eed 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -724,14 +724,14 @@ void LLMediaCtrl::draw()
 		LLGLSUIDefault gls_ui;
 		LLGLDisable gls_alphaTest( GL_ALPHA_TEST );
 
-		gGL.pushUIMatrix();
+		gGL.pushMatrix();
 		{
 			if (mIgnoreUIScale)
 			{
-				gGL.loadUIIdentity();
+				glLoadIdentity();
 				// font system stores true screen origin, need to scale this by UI scale factor
 				// to get render origin for this view (with unit scale)
-				gGL.translateUI(floorf(LLFontGL::sCurOrigin.mX * LLUI::sGLScaleFactor.mV[VX]), 
+				gGL.translatef(floorf(LLFontGL::sCurOrigin.mX * LLUI::sGLScaleFactor.mV[VX]), 
 							floorf(LLFontGL::sCurOrigin.mY * LLUI::sGLScaleFactor.mV[VY]), 
 							LLFontGL::sCurOrigin.mZ);
 			}
@@ -825,7 +825,7 @@ void LLMediaCtrl::draw()
 			gGL.end();
 			gGL.setSceneBlendType(LLRender::BT_ALPHA);
 		}
-		gGL.popUIMatrix();
+		gGL.popMatrix();
 	
 	}
 	else
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 05623198ab..234fe13217 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -153,18 +153,6 @@ void LLNetMap::draw()
 	// Prepare a scissor region
 	F32 rotation = 0;
 
-	gGL.pushMatrix();
-	gGL.pushUIMatrix();
-	
-	LLVector3 offset = gGL.getUITranslation();
-	LLVector3 scale = gGL.getUIScale();
-
-	glLoadIdentity();
-	gGL.loadUIIdentity();
-
-	glScalef(scale.mV[0], scale.mV[1], scale.mV[2]);
-	gGL.translatef(offset.mV[0], offset.mV[1], offset.mV[2]);
-	
 	{
 		LLLocalClipRect clip(getLocalRect());
 		{
@@ -447,9 +435,6 @@ void LLNetMap::draw()
 		}
 	}
 	
-	gGL.popMatrix();
-	gGL.popUIMatrix();
-
 	LLUICtrl::draw();
 }
 
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index f6227c2dd6..de4317b2de 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -476,10 +476,6 @@ public:
 			}
             ypos += y_inc;
 
-			addText(xpos, ypos, llformat("UI Verts/Calls: %d/%d", LLRender::sUIVerts, LLRender::sUICalls));
-			LLRender::sUICalls = LLRender::sUIVerts = 0;
-			ypos += y_inc;
-
 			addText(xpos,ypos, llformat("%d/%d Nodes visible", gPipeline.mNumVisibleNodes, LLSpatialGroup::sNodeCount));
 			
 			ypos += y_inc;
@@ -1847,15 +1843,12 @@ void LLViewerWindow::drawDebugText()
 {
 	gGL.color4f(1,1,1,1);
 	gGL.pushMatrix();
-	gGL.pushUIMatrix();
 	{
 		// scale view by UI global scale factor and aspect ratio correction factor
-		gGL.scaleUI(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f);
+		glScalef(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f);
 		mDebugText->draw();
 	}
-	gGL.popUIMatrix();
 	gGL.popMatrix();
-
 	gGL.flush();
 }
 
@@ -1903,11 +1896,9 @@ void LLViewerWindow::draw()
 	// No translation needed, this view is glued to 0,0
 
 	gGL.pushMatrix();
-	LLUI::pushMatrix();
 	{
-		
 		// scale view by UI global scale factor and aspect ratio correction factor
-		gGL.scaleUI(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f);
+		glScalef(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f);
 
 		LLVector2 old_scale_factor = LLUI::sGLScaleFactor;
 		// apply camera zoom transform (for high res screenshots)
@@ -1973,7 +1964,6 @@ void LLViewerWindow::draw()
 
 		LLUI::sGLScaleFactor = old_scale_factor;
 	}
-	LLUI::popMatrix();
 	gGL.popMatrix();
 
 #if LL_DEBUG
-- 
cgit v1.3


From cf69f03af17070152b5ca2772e7addfd0dcc4800 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Sat, 13 Feb 2010 14:06:31 +0000
Subject: CID-206

Checker: REVERSE_INULL
Function: LLMultiSliderCtrl::onEditorCommit(LLUICtrl *, const LLSD &)
File: /indra/llui/llmultisliderctrl.cpp
---
 indra/llui/llmultisliderctrl.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llmultisliderctrl.cpp b/indra/llui/llmultisliderctrl.cpp
index 50942e55ca..cc26c00a3e 100644
--- a/indra/llui/llmultisliderctrl.cpp
+++ b/indra/llui/llmultisliderctrl.cpp
@@ -330,13 +330,14 @@ void LLMultiSliderCtrl::updateText()
 // static
 void LLMultiSliderCtrl::onEditorCommit( LLUICtrl* ctrl, const LLSD& userdata)
 {
+	llassert(ctrl);
+	if (!ctrl)
+		return;
+
 	LLMultiSliderCtrl* self = dynamic_cast<LLMultiSliderCtrl*>(ctrl->getParent());
 	llassert(self);
 	if (!self) // cast failed - wrong type! :O
 		return;
-
-	if (!ctrl)
-		return;
 	
 	BOOL success = FALSE;
 	F32 val = self->mCurValue;
-- 
cgit v1.3


From d7060eb323f7cfebb7576e2999f782e8617e40e8 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Sat, 13 Feb 2010 14:08:58 +0000
Subject: CID-205

Checker: REVERSE_INULL
Function: LLPanel::fromXML(LLPointer<LLXMLNode>, LLView *, LLPointer<LLXMLNode>)
File: /indra/llui/llpanel.cpp
---
 indra/llui/llpanel.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 7b406e090a..d963cf4c98 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -397,6 +397,12 @@ LLView* LLPanel::fromXML(LLXMLNodePtr node, LLView* parent, LLXMLNodePtr output_
 		if (!panelp)
 		{
 			panelp = LLUICtrlFactory::getInstance()->createFactoryPanel(name);
+			llassert(panelp);
+			
+			if (!panelp)
+			{
+				return NULL; // :(
+			}
 		}
 
 	}
@@ -414,7 +420,7 @@ LLView* LLPanel::fromXML(LLXMLNodePtr node, LLView* parent, LLXMLNodePtr output_
 	panelp->mCommitCallbackRegistrar.popScope();
 	panelp->mEnableCallbackRegistrar.popScope();
 
-	if (panelp && !panelp->getFactoryMap().empty())
+	if (!panelp->getFactoryMap().empty())
 	{
 		LLUICtrlFactory::instance().popFactoryFunctions();
 	}
-- 
cgit v1.3


From eb1d043dafa86480757cc1ed934d96ba51033581 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Sat, 13 Feb 2010 14:13:06 +0000
Subject: CID-203

Checker: REVERSE_INULL
Function: LLTabContainer::addTabPanel(const LLTabContainer::TabPanelParams &)
File: /indra/llui/lltabcontainer.cpp
---
 indra/llui/lltabcontainer.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/llui')

diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 13340e7ded..e810b6fe8f 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -891,6 +891,10 @@ void LLTabContainer::update_images(LLTabTuple* tuple, TabParams params, LLTabCon
 void LLTabContainer::addTabPanel(const TabPanelParams& panel)
 {
 	LLPanel* child = panel.panel();
+
+	llassert(child);
+	if (!child) return;
+
 	const std::string& label = panel.label.isProvided() 
 			? panel.label() 
 			: panel.panel()->getLabel();
-- 
cgit v1.3


From 398af7dd40a060cf9ad8d799df03d448c2f53a96 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Mon, 15 Feb 2010 18:06:49 +0000
Subject: CID-34

Checker: DEADCODE
Function: LLDockableFloater::toggleInstance(const LLSD &)
File: /indra/llui/lldockablefloater.cpp

bool logic precendence assumptions were wrong.
---
 indra/llui/lldockablefloater.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llui')

diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp
index a94f0206a6..0492ab0f25 100644
--- a/indra/llui/lldockablefloater.cpp
+++ b/indra/llui/lldockablefloater.cpp
@@ -95,7 +95,7 @@ void LLDockableFloater::toggleInstance(const LLSD& sdname)
 	LLDockableFloater* instance =
 			dynamic_cast<LLDockableFloater*> (LLFloaterReg::findInstance(name));
 	// if floater closed or docked
-	if (instance == NULL || instance != NULL && instance->isDocked())
+	if (instance == NULL || (instance && instance->isDocked()))
 	{
 		LLFloaterReg::toggleInstance(name, key);
 		// restore button toggle state
-- 
cgit v1.3


From a301ad63c24c8f2ca79559efeee6a780c3ef7ddc Mon Sep 17 00:00:00 2001
From: Vadim Savchuk <vsavchuk@productengine.com>
Date: Tue, 16 Feb 2010 17:58:41 +0200
Subject: Fixed bug EXT-5290 (TP failed if try to teleport from 'Teleport
 completed from...' toast). Reason: LLUrlEntrySLURL::getLocation() failed to
 parse maps.secondlife.com SLURLs (though worked fine for slurl.com ones).

--HG--
branch : product-engine
---
 indra/llui/llurlentry.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 92b7816bdd..3c73ae9b0c 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -287,7 +287,7 @@ std::string LLUrlEntrySLURL::getLabel(const std::string &url, const LLUrlLabelCa
 std::string LLUrlEntrySLURL::getLocation(const std::string &url) const
 {
 	// return the part of the Url after slurl.com/secondlife/
-	const std::string search_string = "secondlife";
+	const std::string search_string = "/secondlife";
 	size_t pos = url.find(search_string);
 	if (pos == std::string::npos)
 	{
-- 
cgit v1.3


From 1513643e62a88531888f330e57aa1eb623061729 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Tue, 16 Feb 2010 15:45:17 -0800
Subject: EXT-5471 -  Tons of spam in log about Invalid param "name" reviewed
 by Rick

---
 indra/llui/llui.cpp            | 10 ++++++++--
 indra/llui/llui.h              |  4 ++--
 indra/llui/lluiimage.h         |  1 +
 indra/llxuixml/llinitparam.cpp | 28 ++++-----------------------
 indra/llxuixml/llinitparam.h   | 43 +++++++++++++++++++-----------------------
 5 files changed, 34 insertions(+), 52 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 76f07373b4..caf04339c2 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -1894,7 +1894,9 @@ namespace LLInitParam
 		blue("blue"),
 		alpha("alpha"),
 		control("")
-	{}
+	{
+		setBlockFromValue();
+	}
 
 	void TypedParam<LLUIColor>::setValueFromBlock() const
 	{
@@ -1939,6 +1941,7 @@ namespace LLInitParam
 		size("size"),
 		style("style")
 	{
+		setBlockFromValue();
 		addSynonym(name, "");
 	}
 
@@ -1979,7 +1982,9 @@ namespace LLInitParam
 		bottom("bottom"),
 		width("width"),
 		height("height")
-	{}
+	{
+		setBlockFromValue();
+	}
 
 	void TypedParam<LLRect>::setValueFromBlock() const
 	{
@@ -2064,6 +2069,7 @@ namespace LLInitParam
 		x("x"),
 		y("y")
 	{
+		setBlockFromValue();
 	}
 
 	void TypedParam<LLCoordGL>::setValueFromBlock() const
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index 5840e76f5c..af8d4ea03b 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -426,8 +426,8 @@ namespace LLInitParam
 	{
         typedef BlockValue<const LLFontGL*> super_t;
 	public:
-		Mandatory<std::string>	name;
-		Optional<std::string>	size,
+		Optional<std::string>	name,
+								size,
 								style;
 
 		TypedParam(BlockDescriptor& descriptor, const char* name, const LLFontGL* const value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count);
diff --git a/indra/llui/lluiimage.h b/indra/llui/lluiimage.h
index bdfc44262d..4ea0738026 100644
--- a/indra/llui/lluiimage.h
+++ b/indra/llui/lluiimage.h
@@ -109,6 +109,7 @@ namespace LLInitParam
 		TypedParam(BlockDescriptor& descriptor, const char* name, super_t::value_assignment_t value, ParamDescriptor::validation_func_t func, S32 min_count, S32 max_count)
 		:	super_t(descriptor, name, value, func, min_count, max_count)
 		{
+			setBlockFromValue();
 		}
 
 		void setValueFromBlock() const;
diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp
index fb0a04dc58..2ead5a4a57 100644
--- a/indra/llxuixml/llinitparam.cpp
+++ b/indra/llxuixml/llinitparam.cpp
@@ -137,7 +137,7 @@ namespace LLInitParam
 	}
 
 
-	bool BaseBlock::validateBlock(bool silent) const
+	bool BaseBlock::validateBlock(bool emit_errors) const
 	{
 		const BlockDescriptor& block_data = getBlockDescriptor();
 		for (BlockDescriptor::param_validation_list_t::const_iterator it = block_data.mValidationList.begin(); it != block_data.mValidationList.end(); ++it)
@@ -145,7 +145,7 @@ namespace LLInitParam
 			const Param* param = getParamFromHandle(it->first);
 			if (!it->second(param))
 			{
-				if (!silent)
+				if (emit_errors)
 				{
 					llwarns << "Invalid param \"" << getParamName(block_data, param) << "\"" << llendl;
 				}
@@ -458,7 +458,7 @@ namespace LLInitParam
 
 	// take all provided params from other and apply to self
 	// NOTE: this requires that "other" is of the same derived type as this
-	bool BaseBlock::overwriteFromImpl(BlockDescriptor& block_data, const BaseBlock& other)
+	bool BaseBlock::merge(BlockDescriptor& block_data, const BaseBlock& other, bool overwrite)
 	{
 		bool param_changed = false;
 		BlockDescriptor::all_params_list_t::const_iterator end_it = block_data.mAllParams.end();
@@ -471,27 +471,7 @@ namespace LLInitParam
 			if (merge_func)
 			{
 				Param* paramp = getParamFromHandle(it->mParamHandle);
-				param_changed |= merge_func(*paramp, *other_paramp, true);
-			}
-		}
-		return param_changed;
-	}
-
-	// take all provided params that are not already provided, and apply to self
-	bool BaseBlock::fillFromImpl(BlockDescriptor& block_data, const BaseBlock& other)
-	{
-		bool param_changed = false;
-		BlockDescriptor::all_params_list_t::const_iterator end_it = block_data.mAllParams.end();
-		for (BlockDescriptor::all_params_list_t::const_iterator it = block_data.mAllParams.begin();
-			it != end_it;
-			++it)
-		{
-			const Param* other_paramp = other.getParamFromHandle(it->mParamHandle);
-			ParamDescriptor::merge_func_t merge_func = it->mMergeFunc;
-			if (merge_func)
-			{
-				Param* paramp = getParamFromHandle(it->mParamHandle);
-				param_changed |= merge_func(*paramp, *other_paramp, false);
+				param_changed |= merge_func(*paramp, *other_paramp, overwrite);
 			}
 		}
 		return param_changed;
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index d264cea3b2..c9c1d4af90 100644
--- a/indra/llxuixml/llinitparam.h
+++ b/indra/llxuixml/llinitparam.h
@@ -407,7 +407,7 @@ namespace LLInitParam
 	class BaseBlock
 	{
 	public:
-		// "Multiple" constraint types
+		// "Multiple" constraint types, put here in root class to avoid ambiguity during use
 		struct AnyAmount
 		{
 			static U32 minCount() { return 0; }
@@ -452,7 +452,7 @@ namespace LLInitParam
 		bool submitValue(const Parser::name_stack_t& name_stack, Parser& p, bool silent=false);
 
 		param_handle_t getHandleFromParam(const Param* param) const;
-		bool validateBlock(bool silent = false) const;
+		bool validateBlock(bool emit_errors = true) const;
 
 		Param* getParamFromHandle(const param_handle_t param_handle)
 		{
@@ -500,10 +500,7 @@ namespace LLInitParam
 
 
 		// take all provided params from other and apply to self
-		bool overwriteFromImpl(BlockDescriptor& block_data, const BaseBlock& other);
-
-		// take all provided params that are not already provided, and apply to self
-		bool fillFromImpl(BlockDescriptor& block_data, const BaseBlock& other);
+		bool merge(BlockDescriptor& block_data, const BaseBlock& other, bool overwrite);
 
 		// can be updated in getters
 		mutable S32				mChangeVersion;
@@ -805,7 +802,7 @@ namespace LLInitParam
 			if (Param::getProvided() && mData.mValidatedVersion < T::getLastChangeVersion())
 			{
 				// a sub-block is "provided" when it has been filled in enough to be valid
-				mData.mValidated = T::validateBlock(true);
+				mData.mValidated = T::validateBlock(false);
 				mData.mValidatedVersion = T::getLastChangeVersion();
 			}
 			return Param::getProvided() && mData.mValidated;
@@ -1236,7 +1233,7 @@ namespace LLInitParam
 				it != mValues.end();
 				++it)
 			{
-				if(it->validateBlock(true)) count++;
+				if(it->validateBlock(false)) count++;
 			}
 			return count;
 		}
@@ -1286,7 +1283,7 @@ namespace LLInitParam
 		bool overwriteFrom(const self_t& other)
 		{
 			mCurChoice = other.mCurChoice;
-			return BaseBlock::overwriteFromImpl(blockDescriptor(), other);
+			return BaseBlock::merge(blockDescriptor(), other, true);
 		}
 
 		// take all provided params that are not already provided, and apply to self
@@ -1413,13 +1410,13 @@ namespace LLInitParam
 		// take all provided params from other and apply to self
 		bool overwriteFrom(const self_t& other)
 		{
-			return BaseBlock::overwriteFromImpl(blockDescriptor(), other);
+			return BaseBlock::merge(blockDescriptor(), other, true);
 		}
 
 		// take all provided params that are not already provided, and apply to self
 		bool fillFrom(const self_t& other)
 		{
-			return BaseBlock::fillFromImpl(blockDescriptor(), other);
+			return BaseBlock::merge(blockDescriptor(), other, false);
 		}
 	protected:
 		Block()
@@ -1710,7 +1707,7 @@ namespace LLInitParam
 			// if cached value is stale, regenerate from params
 			if (Param::getProvided() && mData.mLastParamVersion < BaseBlock::getLastChangeVersion())
 			{
-				if (block_t::validateBlock(true))
+				if (block_t::validateBlock(false))
 				{
 					static_cast<const DERIVED*>(this)->setValueFromBlock();
 					// clear stale keyword associated with old value
@@ -1769,7 +1766,7 @@ namespace LLInitParam
 			if (Param::getProvided() && (mData.mLastParamVersion < BaseBlock::getLastChangeVersion()))
 			{
 				// go ahead and issue warnings at this point if any param is invalid
-				if(block_t::validateBlock(false))
+				if(block_t::validateBlock(true))
 				{
 					static_cast<const DERIVED*>(this)->setValueFromBlock();
 					mData.clearKey();
@@ -1797,25 +1794,23 @@ namespace LLInitParam
 	private:
 		static bool mergeWith(Param& dst, const Param& src, bool overwrite)
 		{
-			const self_t& src_param = static_cast<const self_t&>(src);
+			const self_t& src_typed_param = static_cast<const self_t&>(src);
 			self_t& dst_typed_param = static_cast<self_t&>(dst);
 
-			if (src_param.isProvided()
+			if (src_typed_param.isProvided()
 				&& (overwrite || !dst_typed_param.isProvided()))
 			{
 				// assign individual parameters
-				if (overwrite)
-				{
-					dst_typed_param.BaseBlock::overwriteFromImpl(block_t::blockDescriptor(), src_param);
-				}
-				else
-				{
-					dst_typed_param.BaseBlock::fillFromImpl(block_t::blockDescriptor(), src_param);
-				}
+				dst_typed_param.BaseBlock::merge(block_t::blockDescriptor(), src_typed_param, overwrite);
+
 				// then copy actual value
-				dst_typed_param.mData.mValue = src_param.get();
+				dst_typed_param.mData.mValue = src_typed_param.get();
 				dst_typed_param.mData.clearKey();
 				dst_typed_param.setProvided(true);
+
+				// Propagate value back to block params since the value was updated during this merge.
+				// This will result in mData.mValue and the block params being in sync.
+				static_cast<DERIVED&>(dst_typed_param).setBlockFromValue();
 				return true;
 			}
 			return false;
-- 
cgit v1.3


From 69032d8d9d660de5b3c97589b7cc55dac70b153c Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Tue, 16 Feb 2010 19:14:55 -0800
Subject: EXT-5071 - Script Editor slows down FPS when editing scripts with
 500+ lines

reviewed by Monroe
---
 indra/llui/lltexteditor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index ce5f1bd082..7d230f7d42 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -2524,9 +2524,9 @@ void LLTextEditor::loadKeywords(const std::string& filename,
 
 void LLTextEditor::updateSegments()
 {
-	LLFastTimer ft(FTM_SYNTAX_HIGHLIGHTING);
-	if (mKeywords.isLoaded())
+	if (mReflowIndex < S32_MAX && mKeywords.isLoaded())
 	{
+		LLFastTimer ft(FTM_SYNTAX_HIGHLIGHTING);
 		// HACK:  No non-ascii keywords for now
 		segment_vec_t segment_list;
 		mKeywords.findSegments(&segment_list, getWText(), mDefaultColor.get(), *this);
-- 
cgit v1.3


From 619415a99a08f66b8247ccd0b427c8483ba22e82 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 17 Feb 2010 15:32:00 +0200
Subject: Moved shadow drawing code from draw to separate function(drawShadow)
 to make this code reusable.

--HG--
branch : product-engine
---
 indra/llui/llfloater.cpp | 39 +++++++++++++++++++++++++--------------
 indra/llui/llfloater.h   |  1 +
 2 files changed, 26 insertions(+), 14 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index a55915af35..0199fe3f57 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1565,25 +1565,13 @@ void LLFloater::draw()
 	// draw background
 	if( isBackgroundVisible() )
 	{
+		drawShadow(this);
+
 		S32 left = LLPANEL_BORDER_WIDTH;
 		S32 top = getRect().getHeight() - LLPANEL_BORDER_WIDTH;
 		S32 right = getRect().getWidth() - LLPANEL_BORDER_WIDTH;
 		S32 bottom = LLPANEL_BORDER_WIDTH;
 
-		static LLUICachedControl<S32> shadow_offset_S32 ("DropShadowFloater", 0);
-		static LLUIColor shadow_color_cached = LLUIColorTable::instance().getColor("ColorDropShadow");
-		LLColor4 shadow_color = shadow_color_cached;
-		F32 shadow_offset = (F32)shadow_offset_S32;
-
-		if (!isBackgroundOpaque())
-		{
-			shadow_offset *= 0.2f;
-			shadow_color.mV[VALPHA] *= 0.5f;
-		}
-		gl_drop_shadow(left, top, right, bottom, 
-			shadow_color % alpha, 
-			llround(shadow_offset));
-
 		LLUIImage* image = NULL;
 		LLColor4 color;
 		if (isBackgroundOpaque())
@@ -1666,6 +1654,29 @@ void LLFloater::draw()
 	}
 }
 
+void	LLFloater::drawShadow(LLPanel* panel)
+{
+	F32 alpha = panel->getDrawContext().mAlpha;
+	S32 left = LLPANEL_BORDER_WIDTH;
+	S32 top = panel->getRect().getHeight() - LLPANEL_BORDER_WIDTH;
+	S32 right = panel->getRect().getWidth() - LLPANEL_BORDER_WIDTH;
+	S32 bottom = LLPANEL_BORDER_WIDTH;
+
+	static LLUICachedControl<S32> shadow_offset_S32 ("DropShadowFloater", 0);
+	static LLUIColor shadow_color_cached = LLUIColorTable::instance().getColor("ColorDropShadow");
+	LLColor4 shadow_color = shadow_color_cached;
+	F32 shadow_offset = (F32)shadow_offset_S32;
+
+	if (!panel->isBackgroundOpaque())
+	{
+		shadow_offset *= 0.2f;
+		shadow_color.mV[VALPHA] *= 0.5f;
+	}
+	gl_drop_shadow(left, top, right, bottom, 
+		shadow_color % alpha, 
+		llround(shadow_offset));
+}
+
 void	LLFloater::setCanMinimize(BOOL can_minimize)
 {
 	// if removing minimize/restore button programmatically,
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 2166d8db8a..19e8288807 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -222,6 +222,7 @@ public:
 	virtual BOOL	handleScrollWheel(S32 x, S32 y, S32 mask);
 	
 	virtual void	draw();
+	virtual void	drawShadow(LLPanel* panel);
 	
 	virtual void	onOpen(const LLSD& key) {}
 	virtual void	onClose(bool app_quitting) {}
-- 
cgit v1.3