Permalink
Browse files

Sync llspatialpartition, fixes compile of two commits ago.

  • Loading branch information...
Lirusaito committed Apr 13, 2016
1 parent b90d905 commit b05f6ee9da1aa155a08ddbeec2fa0721b241a471
Showing with 2 additions and 8 deletions.
  1. +2 −8 indra/newview/llspatialpartition.cpp
@@ -744,9 +744,9 @@ void LLSpatialGroup::handleDestruction(const TreeNode* node)
if (bridge->mAvatar.notNull())
{
bridge->mAvatar->mAttachmentGeometryBytes -= mGeometryBytes;
- bridge->mAvatar->mAttachmentGeometryBytes = llmax(bridge->mAvatar->mAttachmentGeometryBytes, U32(0));
+ bridge->mAvatar->mAttachmentGeometryBytes = llmax(bridge->mAvatar->mAttachmentGeometryBytes, 0);
bridge->mAvatar->mAttachmentSurfaceArea -= mSurfaceArea;
- bridge->mAvatar->mAttachmentSurfaceArea = llmax(bridge->mAvatar->mAttachmentSurfaceArea, F32(0.f));
+ bridge->mAvatar->mAttachmentSurfaceArea = llmax(bridge->mAvatar->mAttachmentSurfaceArea, 0.f);
}
}
@@ -813,12 +813,6 @@ void LLSpatialGroup::destroyGL(bool keep_occlusion)
}
}
-
-
-
-
-
-
//==============================================
LLSpatialPartition::LLSpatialPartition(U32 data_mask, BOOL render_by_group, U32 buffer_usage)

0 comments on commit b05f6ee

Please sign in to comment.