livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refine fix for MAINT-5560 based on review feedback and to fix VS objection

meow-7.2.2
Oz Linden 2015-08-26 12:07:16 -04:00
parent 206ef7a156
commit 712a4e70c8
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llavatarrenderinfoaccountant.cpp
View File

@ -268,8 +268,10 @@ void LLAvatarRenderInfoAccountant::sendRenderInfoToRegion(LLViewerRegion * regio
LLSD info = LLSD::emptyMap(); LLSD info = LLSD::emptyMap();
U32 avatar_complexity = avatar->getVisualComplexity(); U32 avatar_complexity = avatar->getVisualComplexity();
if (avatar_complexity > 0) if (avatar_complexity > 0)
{ {
// the weight/complexity is unsigned, but LLSD only stores signed integers,
// so if it's over that (which would be ridiculously high), just store the maximum signed int value
info[KEY_WEIGHT] = (S32)(avatar_complexity < S32_MAX ? avatar_complexity : S32_MAX); info[KEY_WEIGHT] = (S32)(avatar_complexity < S32_MAX ? avatar_complexity : S32_MAX);
info[KEY_TOO_COMPLEX] = LLSD::Boolean(avatar->isTooComplex()); info[KEY_TOO_COMPLEX] = LLSD::Boolean(avatar->isTooComplex());
agents[avatar->getID().asString()] = info; agents[avatar->getID().asString()] = info;

3
indra/newview/llspatialpartition.cpp
View File

@ -862,8 +862,7 @@ void LLSpatialGroup::handleDestruction(const TreeNode* node)
{ {
if (bridge->mAvatar.notNull()) if (bridge->mAvatar.notNull())
{ {
bridge->mAvatar->modifyAttachmentGeometryBytes( -mGeometryBytes ); bridge->mAvatar->subtractAttachmentSizes( mGeometryBytes, mSurfaceArea );
bridge->mAvatar->modifyAttachmentSurfaceArea( -mSurfaceArea );
} }
} }

11
indra/newview/llvoavatar.cpp
View File

@ -8283,15 +8283,16 @@ void LLVOAvatar::idleUpdateRenderComplexity()
} }
} }
void LLVOAvatar::modifyAttachmentGeometryBytes(S32 delta) void LLVOAvatar::addAttachmentSizes(U32 delta_bytes, F32 delta_area)
{ {
mAttachmentGeometryBytes = llmax(mAttachmentGeometryBytes + delta, 0); mAttachmentGeometryBytes += delta_bytes;
mAttachmentSurfaceArea += delta_area;
} }
void LLVOAvatar::modifyAttachmentSurfaceArea(F32 delta) void LLVOAvatar::subtractAttachmentSizes(U32 delta_bytes, F32 delta_area)
{ {
F32 newval = mAttachmentSurfaceArea + delta; mAttachmentGeometryBytes = delta_bytes > mAttachmentGeometryBytes ? 0 : mAttachmentGeometryBytes - delta_bytes;
mAttachmentSurfaceArea = ( newval > 0.0 ? newval : 0.0 ); mAttachmentSurfaceArea = delta_area > mAttachmentSurfaceArea ? 0.0 : mAttachmentSurfaceArea - delta_area;
} }
void LLVOAvatar::updateVisualComplexity() void LLVOAvatar::updateVisualComplexity()

4
indra/newview/llvoavatar.h
View File

@ -258,9 +258,9 @@ public:
U32 getVisualComplexity() { return mVisualComplexity; }; // Numbers calculated here by rendering AV U32 getVisualComplexity() { return mVisualComplexity; }; // Numbers calculated here by rendering AV
S32 getAttachmentGeometryBytes() { return mAttachmentGeometryBytes; }; // number of bytes in attached geometry S32 getAttachmentGeometryBytes() { return mAttachmentGeometryBytes; }; // number of bytes in attached geometry
void modifyAttachmentGeometryBytes(S32 delta);
F32 getAttachmentSurfaceArea() { return mAttachmentSurfaceArea; }; // estimated surface area of attachments F32 getAttachmentSurfaceArea() { return mAttachmentSurfaceArea; }; // estimated surface area of attachments
void modifyAttachmentSurfaceArea(F32 delta); void addAttachmentSizes(U32 delta_bytes, F32 delta_area);
void subtractAttachmentSizes(U32 delta_bytes, F32 delta_area);
U32 getReportedVisualComplexity() { return mReportedVisualComplexity; }; // Numbers as reported by the SL server U32 getReportedVisualComplexity() { return mReportedVisualComplexity; }; // Numbers as reported by the SL server
void setReportedVisualComplexity(U32 value) { mReportedVisualComplexity = value; }; void setReportedVisualComplexity(U32 value) { mReportedVisualComplexity = value; };

6
indra/newview/llvovolume.cpp
View File

@ -4703,8 +4703,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
if (pAvatarVO) if (pAvatarVO)
{ {
pAvatarVO->modifyAttachmentGeometryBytes( -group->mGeometryBytes ); pAvatarVO->subtractAttachmentSizes( group->mGeometryBytes, group->mSurfaceArea );
pAvatarVO->modifyAttachmentSurfaceArea( -group->mSurfaceArea );
} }
group->mGeometryBytes = 0; group->mGeometryBytes = 0;
@ -5258,8 +5257,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
if (pAvatarVO) if (pAvatarVO)
{ {
pAvatarVO->modifyAttachmentGeometryBytes( group->mGeometryBytes ); pAvatarVO->addAttachmentSizes( group->mGeometryBytes, group->mSurfaceArea );
pAvatarVO->modifyAttachmentSurfaceArea( group->mSurfaceArea );
} }
} }