Merge downstream code

6 files changed, 5 insertions, 40 deletions

diff --git a/indra/llcommon/lllslconstants.h b/indra/llcommon/lllslconstants.h
index efa66390e8..926ce32d75 100755
--- a/indra/llcommon/lllslconstants.h
+++ b/indra/llcommon/lllslconstants.h
@@ -208,8 +208,6 @@ const S32 OBJECT_PHYSICS = 21;
 const S32 OBJECT_PHANTOM = 22;
 const S32 OBJECT_TEMP_ON_REZ = 23;
 const S32 OBJECT_RENDER_WEIGHT = 24;
-const S32 OBJECT_ATTACHMENT_GEOMETRY_BYTES = 25;
-const S32 OBJECT_ATTACHMENT_SURFACE_AREA = 26;
 
 // llTextBox() magic token string - yes this is a hack.  sue me.
 char const* const TEXTBOX_MAGIC_TOKEN = "!!llTextBox!!";
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
index 8ed5f99a89..88dfc2e9f3 100755
--- a/indra/lscript/lscript_compile/indra.l
+++ b/indra/lscript/lscript_compile/indra.l
@@ -290,8 +290,6 @@ int yyerror(const char *fmt, ...);
 "OBJECT_PHANTOM"				{ count(); yylval.ival = OBJECT_PHANTOM; return(INTEGER_CONSTANT); }
 "OBJECT_TEMP_ON_REZ"			{ count(); yylval.ival = OBJECT_TEMP_ON_REZ; return(INTEGER_CONSTANT); }
 "OBJECT_RENDER_WEIGHT"			{ count(); yylval.ival = OBJECT_RENDER_WEIGHT; return(INTEGER_CONSTANT); }
-"OBJECT_ATTACHMENT_GEOMETRY_BYTES"		{ count(); yylval.ival = OBJECT_ATTACHMENT_GEOMETRY_BYTES; return(INTEGER_CONSTANT); }
-"OBJECT_ATTACHMENT_SURFACE_AREA"		{ count(); yylval.ival = OBJECT_ATTACHMENT_SURFACE_AREA; return(INTEGER_CONSTANT); }
 
 "TYPE_INTEGER"			{ count(); yylval.ival = LST_INTEGER; return(INTEGER_CONSTANT); }	
 "TYPE_FLOAT"			{ count(); yylval.ival = LST_FLOATINGPOINT; return(INTEGER_CONSTANT); }	
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index ef3c319da6..5ff8408943 100755
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -195,8 +195,6 @@ OBJECT_PHYSICS				Used with llGetObjectDetails to determine if the object is phy
 OBJECT_PHANTOM				Used with llGetObjectDetails to determine if the object is phantom or not
 OBJECT_TEMP_ON_REZ			Used with llGetObjectDetails to determine if the object is temporary or not
 OBJECT_RENDER_WEIGHT		Used with llGetObjectDetails to return an avatar's rendering weight
-OBJECT_ATTACHMENT_GEOMETRY_BYTES	Used with llGetObjectDetails to return an avatar's attachment rendering geometry bytes
-OBJECT_ATTACHMENT_SURFACE_AREA		Used with llGetObjectDetails to return an avatar's attachment surface area
 
 
 # some vehicle params
diff --git a/indra/newview/llavatarrenderinfoaccountant.cpp b/indra/newview/llavatarrenderinfoaccountant.cpp
index 2a4ec6d320..89c1b2a186 100644
--- a/indra/newview/llavatarrenderinfoaccountant.cpp
+++ b/indra/newview/llavatarrenderinfoaccountant.cpp
@@ -46,8 +46,6 @@
 
 static	const std::string KEY_AGENTS = "agents";			// map
 static 	const std::string KEY_WEIGHT = "weight";			// integer
-static	const std::string KEY_GEOMETRY = "geometry";		// integer
-static	const std::string KEY_SURFACE =	"surface";			// float
 
 static	const std::string KEY_IDENTIFIER = "identifier";
 static	const std::string KEY_MESSAGE = "message";
@@ -125,14 +123,6 @@ public:
 								{
 									((LLVOAvatar *) avatarp)->setReportedVisualComplexity(agent_info_map[KEY_WEIGHT].asInteger());
 								}
-								if (agent_info_map.has(KEY_GEOMETRY))
-								{
-									((LLVOAvatar *) avatarp)->setReportedAttachmentGeometryBytes(agent_info_map[KEY_GEOMETRY].asInteger());
-								}
-								if (agent_info_map.has(KEY_SURFACE))
-								{
-									((LLVOAvatar *) avatarp)->setReportedAttachmentSurfaceArea((F32) agent_info_map[KEY_SURFACE].asReal());
-								}
 							}
 							report_iter++;
 						}
@@ -259,24 +249,13 @@ void LLAvatarRenderInfoAccountant::sendRenderInfoToRegion(LLViewerRegion * regio
 				if (avatar->getVisualComplexity() > 0)
 				{
 					info[KEY_WEIGHT] = avatar->getVisualComplexity();
-				}
-				if (avatar->getAttachmentGeometryBytes() >= 0)
-				{
-					info[KEY_GEOMETRY] = (S32) avatar->getAttachmentGeometryBytes();
-				}
-				if (avatar->getAttachmentSurfaceArea() >= 0.f)
-				{
-					info[KEY_SURFACE] = avatar->getAttachmentSurfaceArea();
-				}
-				if (info.size() > 0)
-				{
 					agents[avatar->getID().asString()] = info;
-				}
 
-				if (logRenderInfo())
-				{
-					llinfos << "Sending avatar render info for " << avatar->getID()
-						<< ": " << info << llendl;
+					if (logRenderInfo())
+					{
+						llinfos << "Sending avatar render info for " << avatar->getID()
+							<< ": " << info << llendl;
+					}
 				}
 			}
 			iter++;
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 0ffd8ad119..6a504e10c4 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -670,8 +670,6 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
 	mAttachmentGeometryBytes(-1),
 	mAttachmentSurfaceArea(-1.f),
 	mReportedVisualComplexity(-1),
-	mReportedAttachmentGeometryBytes(-1),
-	mReportedAttachmentSurfaceArea(-1.f),
 	mTurning(FALSE),
 	mLastSkeletonSerialNum( 0 ),
 	mIsSitting(FALSE),
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index be2d69a41a..295175133c 100755
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -259,10 +259,6 @@ public:
 
 	S32				getReportedVisualComplexity()					{ return mReportedVisualComplexity;				};	// Numbers as reported by the SL server
 	void			setReportedVisualComplexity(S32 value)			{ mReportedVisualComplexity = value;			};
-	S32				getReportedAttachmentGeometryBytes()			{ return mReportedAttachmentGeometryBytes;		};	//number of bytes in attached geometry
-	void			setReportedAttachmentGeometryBytes(S32 value)	{ mReportedAttachmentGeometryBytes = value;		};
-	F32				getReportedAttachmentSurfaceArea()		{ return mReportedAttachmentSurfaceArea;				};		//estimated surface area of attachments
-	void			setReportedAttachmentSurfaceArea(F32 value)		{ mReportedAttachmentSurfaceArea = value;		};
 	
 	S32				getUpdatePeriod()				{ return mUpdatePeriod;			};
 	const LLColor4 &  getMutedAVColor()				{ return mMutedAVColor;			};
@@ -416,8 +412,6 @@ public:
 	F32			mAttachmentSurfaceArea; //estimated surface area of attachments
 
 	S32			mReportedVisualComplexity;			// Numbers as reported by the SL server
-	S32			mReportedAttachmentGeometryBytes;	//number of bytes in attached geometry
-	F32			mReportedAttachmentSurfaceArea;		//estimated surface area of attachments
 
 private:
 	bool		shouldAlphaMask();