From 7abecb48babe6a6f09bf6692ba55076546cfced9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 1 Dec 2008 17:39:58 -0600
Subject: Second Life viewer sources 1.22.0-RC

---
 linden/indra/newview/llvoavatar.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'linden/indra/newview/llvoavatar.h')

diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index d66ddfc..8265e8a 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -308,6 +308,16 @@ public:
 	U32 renderTransparent();
 	void renderCollisionVolumes();
 	
+	/*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
+									  S32 face = -1,                          // which face to check, -1 = ALL_SIDES
+									  BOOL pick_transparent = FALSE,
+									  S32* face_hit = NULL,                   // which face was hit
+									  LLVector3* intersection = NULL,         // return the intersection point
+									  LLVector2* tex_coord = NULL,            // return the texture coordinates of the intersection point
+									  LLVector3* normal = NULL,               // return the surface normal at the intersection point
+									  LLVector3* bi_normal = NULL             // return the surface bi-normal at the intersection point
+		);
+
 	/*virtual*/ void updateTextures(LLAgent &agent);
 	// If setting a baked texture, need to request it from a non-local sim.
 	/*virtual*/ S32 setTETexture(const U8 te, const LLUUID& uuid);
-- 
cgit v1.1


From 22b861982f2efd5d16097a012627e73b9fb85834 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 9 Dec 2008 22:25:37 -0600
Subject: Second Life viewer sources 1.22.2-RC

---
 linden/indra/newview/llvoavatar.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'linden/indra/newview/llvoavatar.h')

diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 8265e8a..802d3a0 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -913,6 +913,9 @@ public:
 	static BOOL		sJointDebug;
 	static ETextureIndex sBakedTextureIndices[BAKED_TEXTURE_COUNT];
 
+	static F32 		sUnbakedTime; // Total seconds with >=1 unbaked avatars
+	static F32 		sGreyTime; // Total seconds with >=1 grey avatars
+	
 	//--------------------------------------------------------------------
 	// Texture Layer Sets and Global Colors
 	//--------------------------------------------------------------------	
@@ -977,6 +980,7 @@ protected:
 	F32					mLastFadeDistance;
 	F32					mMinPixelArea; // debug
 	F32					mMaxPixelArea; // debug
+	BOOL				mHasGrey; // debug
 	
 	//--------------------------------------------------------------------
 	// Global Colors
@@ -1012,7 +1016,7 @@ protected:
 	
 	BOOL			isFullyBaked();
 	void			deleteLayerSetCaches();
-	static BOOL		areAllNearbyInstancesBaked();
+	static BOOL		areAllNearbyInstancesBaked(S32& grey_avatars);
 
 	static void		onBakedTextureMasksLoaded(BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata);
 
-- 
cgit v1.1


From a87e38229921b48c32187c672a942516722f1b52 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 11 Jan 2009 16:10:39 -0600
Subject: Second Life viewer sources 1.22.5-RC

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

(limited to 'linden/indra/newview/llvoavatar.h')

diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 802d3a0..81cfc6f 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
-- 
cgit v1.1


From 0ef11cf31364456ec247b0fc7ad8f6d1de408400 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 28 Jan 2009 20:04:52 -0600
Subject: Second Life viewer sources 1.22.6-RC

---
 linden/indra/newview/llvoavatar.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linden/indra/newview/llvoavatar.h')

diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 81cfc6f..9806ceb 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -914,7 +914,9 @@ public:
 	static ETextureIndex sBakedTextureIndices[BAKED_TEXTURE_COUNT];
 
 	static F32 		sUnbakedTime; // Total seconds with >=1 unbaked avatars
+	static F32 		sUnbakedUpdateTime; // Last time stats were updated (to prevent multiple updates per frame) 
 	static F32 		sGreyTime; // Total seconds with >=1 grey avatars
+	static F32 		sGreyUpdateTime; // Last time stats were updated (to prevent multiple updates per frame) 
 	
 	//--------------------------------------------------------------------
 	// Texture Layer Sets and Global Colors
-- 
cgit v1.1