merge

1 files changed, 14 insertions, 6 deletions

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 288cf728b9..1ea9655b26 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -4903,7 +4903,6 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
 		{
 			inspect_item_id = inspect_instance->getSelectedUUID();
 		}
-		LLUUID focus_item_id = LLViewerMediaFocus::getInstance()->getSelectedUUID();
 		for (S32 pass = 0; pass < 2; pass++)
 		{
 			for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
@@ -4917,11 +4916,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
 				{
 					continue;
 				}
-				if (objectp->getID() == focus_item_id)
-				{
-					node->renderOneSilhouette(gFocusMgr.getFocusColor());
-				}
-				else if(objectp->getID() == inspect_item_id)
+				if(objectp->getID() == inspect_item_id)
 				{
 					node->renderOneSilhouette(sHighlightInspectColor);
 				}
@@ -4975,6 +4970,19 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
 		}
 	}
 
+#if 0	
+	// Hilight focused media object
+	{
+		LLViewerObject* objectp = LLViewerMediaFocus::getInstance()->getFocusedObject();
+		if(objectp)
+		{
+			// FIXME: how do I construct a silhouette for an object that's not selected?
+			// Would we need to add another LLObjectSelectionHandle for this purpose?
+			node->renderOneSilhouette(gFocusMgr.getFocusColor());
+		}
+	}
+#endif
+
 	if (for_hud && avatar)
 	{
 		glMatrixMode(GL_PROJECTION);