From f3651ae32c96296d93d4920ed33103d568a9c1fd Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 8 Mar 2010 16:41:20 -0800
Subject: Trivial header file cleanup

---
 indra/newview/llhudobject.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llhudobject.h')

diff --git a/indra/newview/llhudobject.h b/indra/newview/llhudobject.h
index d304ac41af..6b70d1922c 100644
--- a/indra/newview/llhudobject.h
+++ b/indra/newview/llhudobject.h
@@ -42,7 +42,7 @@
 #include "v4color.h"
 #include "v3math.h"
 #include "v3dmath.h"
-#include "lldrawpool.h"
+#include "lldrawpool.h"		// TODO: eliminate, unused below
 #include <list>
 
 class LLViewerCamera;
-- 
cgit v1.2.3


From 717a4800f1ae0ae6ea0bbe9ed0af21c7851f5d0a Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 9 Mar 2010 14:28:48 -0800
Subject: Break name tag code out into LLHUDNameTag Start by duplicating the
 LLHUDText code, then stripping out functionality that only needs to exist in
 one place (like force-based juggling of name tag positions)

---
 indra/newview/llhudobject.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llhudobject.h')

diff --git a/indra/newview/llhudobject.h b/indra/newview/llhudobject.h
index 6b70d1922c..a370b31a20 100644
--- a/indra/newview/llhudobject.h
+++ b/indra/newview/llhudobject.h
@@ -76,6 +76,9 @@ public:
 	static void renderAll();
 	static void renderAllForSelect();
 
+	// Some objects may need to update when window shape changes
+	static void reshapeAll();
+
 	static void cleanupHUDObjects();
 
 	enum
@@ -96,7 +99,8 @@ public:
 		LL_HUD_EFFECT_EDIT,
 		LL_HUD_EFFECT_LOOKAT,
 		LL_HUD_EFFECT_POINTAT,
-		LL_HUD_EFFECT_VOICE_VISUALIZER	// Ventrella
+		LL_HUD_EFFECT_VOICE_VISUALIZER,	// Ventrella
+		LL_HUD_NAME_TAG
 	};
 protected:
 	static void sortObjects();
@@ -112,7 +116,6 @@ protected:
 	BOOL			mDead;
 	BOOL			mVisible;
 	LLVector3d		mPositionGlobal;
-	BOOL			mOnHUDAttachment;
 	LLPointer<LLViewerObject> mSourceObject;
 	LLPointer<LLViewerObject> mTargetObject;
 
-- 
cgit v1.2.3


From 393c819477b268aa0a05ec0a006e1dba27d6e6c6 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Sun, 10 Oct 2010 15:25:11 +0100
Subject: VWR-21967 There's lots of ::renderForSelect() code that we don't need
 any more. VWR-22088 Remove underlying ::renderForSelect() code
 (render-pipeline)

---
 indra/newview/llhudobject.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/llhudobject.h')

diff --git a/indra/newview/llhudobject.h b/indra/newview/llhudobject.h
index 97145b9a84..36f809eca2 100644
--- a/indra/newview/llhudobject.h
+++ b/indra/newview/llhudobject.h
@@ -100,7 +100,6 @@ protected:
 	~LLHUDObject();
 
 	virtual void render() = 0;
-	virtual void renderForSelect() {};
 	virtual void renderForTimer() {};
 	
 protected:
-- 
cgit v1.2.3