From 58bce2d205bee3f5adb33b15efe73098e77429eb Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 9 Sep 2009 01:26:44 +0000
Subject: merge -r132032-132812
 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1

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

(limited to 'indra/newview/llviewerobjectlist.cpp')

diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index a8232e9a9d..acdc2c2513 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -49,7 +49,7 @@
 #include "llagent.h"
 #include "pipeline.h"
 #include "llspatialpartition.h"
-#include "llhoverview.h"
+#include "lltooltip.h"
 #include "llworld.h"
 #include "llstring.h"
 #include "llhudtext.h"
@@ -574,10 +574,14 @@ void LLViewerObjectList::updateApparentAngles(LLAgent &agent)
 		// Slam priorities for textures that we care about (hovered, selected, and focused)
 		// Hovered
 		// Assumes only one level deep of parenting
-		objectp = gHoverView->getLastHoverObject();
-		if (objectp)
+		LLSelectNode* nodep = LLSelectMgr::instance().getHoverNode();
+		if (nodep)
 		{
-			objectp->boostTexturePriority();
+			objectp = nodep->getObject();
+			if (objectp)
+			{
+				objectp->boostTexturePriority();
+			}
 		}
 	}
 
-- 
cgit v1.2.3