From 90da6d6fdc33343be72252101aed1be641e822b5 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Sun, 19 Sep 2010 23:07:15 -0500
Subject: Raycasting for rigged attachments now works for your own attachments
 while in edit mode.

---
 indra/newview/llvovolume.h | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

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

diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index eeb98726c9..d868099eeb 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -46,6 +46,8 @@ class LLDrawPool;
 class LLSelectNode;
 class LLObjectMediaDataClient;
 class LLObjectMediaNavigateClient;
+class LLVOAvatar;
+class LLMeshSkinInfo;
 
 typedef std::vector<viewer_media_t> media_list_t;
 
@@ -54,6 +56,18 @@ enum LLVolumeInterfaceType
 	INTERFACE_FLEXIBLE = 1,
 };
 
+
+class LLRiggedVolume : public LLVolume
+{
+public:
+	LLRiggedVolume(const LLVolumeParams& params)
+		: LLVolume(params, 0.f)
+	{
+	}
+
+	void update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, const LLVolume* src_volume);
+};
+
 // Base class for implementations of the volume - Primitive, Flexible Object, etc.
 class LLVolumeInterface
 {
@@ -289,6 +303,11 @@ public:
 	void removeMDCImpl() { --mMDCImplCount; }
 	S32 getMDCImplCount() { return mMDCImplCount; }
 	
+
+	//rigged volume update (for raycasting)
+	void updateRiggedVolume();
+	LLRiggedVolume* getRiggedVolume() { return mRiggedVolume; }
+
 protected:
 	S32	computeLODDetail(F32	distance, F32 radius);
 	BOOL calcLOD();
@@ -322,6 +341,9 @@ private:
 	S32			mLastFetchedMediaVersion; // as fetched from the server, starts as -1
 	S32 mIndexInTex;
 	S32 mMDCImplCount;
+
+	LLPointer<LLRiggedVolume> mRiggedVolume;
+
 	// statics
 public:
 	static F32 sLODSlopDistanceFactor;// Changing this to zero, effectively disables the LOD transition slop 
-- 
cgit v1.2.3


From c42ed54b0a532cb4e0ad30a1b0b5038cef9938f2 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Mon, 20 Sep 2010 18:45:56 -0500
Subject: Stop using ll_aligned_malloc/free in llvolume. Fix for garbage data
 in vertex weight array crashing software skinning. Proper integration of
 picking for rigged attachhments. Optimization in LLDrawable::updateDistance
 (don't call updateRelativeXform, just use spatial group position).

---
 indra/newview/llvovolume.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index d868099eeb..f058710a27 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -306,7 +306,17 @@ public:
 
 	//rigged volume update (for raycasting)
 	void updateRiggedVolume();
-	LLRiggedVolume* getRiggedVolume() { return mRiggedVolume; }
+	LLRiggedVolume* getRiggedVolume();
+
+	//returns true if volume should be treated as a rigged volume
+	// - Build tools are open
+	// - object is an attachment
+	// - object is attached to self
+	// - object is rendered as rigged
+	bool treatAsRigged();
+
+	//clear out rigged volume and revert back to non-rigged state for picking/LOD/distance updates
+	void clearRiggedVolume();
 
 protected:
 	S32	computeLODDetail(F32	distance, F32 radius);
-- 
cgit v1.2.3


From 90e3d83a5cb35e98a02a3017dd79ebc272bbfe85 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Tue, 21 Sep 2010 13:26:52 -0400
Subject: Fix for build failures - disabling tcmalloc for now

---
 indra/newview/llvovolume.h | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/newview/llvovolume.h

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

diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
old mode 100644
new mode 100755
-- 
cgit v1.2.3