SL-704 - code cleanup, mostly old AXON comments.

1 files changed, 7 insertions, 14 deletions

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 127dfe7c60..dba99c7e98 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1300,7 +1300,7 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
 
     S32 box_detail = gSavedSettings.getS32("AvatarBoundingBoxComplexity");
 
-    // AXON the update_min_max function used below assumes there is a
+    // FIXME the update_min_max function used below assumes there is a
     // known starting point, but in general there isn't. Ideally the
     // box update logic should be modified to handle the no-point-yet
     // case. For most models, starting with the pelvis is safe though.
@@ -1361,7 +1361,7 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
                      attachment_iter != attachment->mAttachedObjects.end();
                      ++attachment_iter)
                 {
-                    // AXON Don't we need to look at children of attached_object as well?
+                    // Don't we need to look at children of attached_object as well?
                     const LLViewerObject* attached_object = (*attachment_iter);
                     if (attached_object && !attached_object->isHUDAttachment())
                     {
@@ -1418,8 +1418,8 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
     // Stretch bounding box by rigged mesh joint boxes
     if (box_detail>=3)
     {
-        // AXON try to cache unless something has changed about attached rigged meshes.
-        // Needs more logic based on volume states.
+        // FIXME could try to cache unless something has changed about attached rigged meshes, 
+        // but needs more logic based on volume states.
 
         //if (mRiggingInfoTab.needsUpdate())
         {
@@ -5962,13 +5962,6 @@ void LLVOAvatar::rebuildAttachmentOverrides()
 // -----------------------------------------------------------------------------
 void LLVOAvatar::updateAttachmentOverrides()
 {
-    const bool paranoid_checking = false; 	// AXON remove when testing done
-
-    if (paranoid_checking)
-    {
-        //dumpArchetypeXML(getFullname() + "_paranoid_before");
-    }
-
     LLScopedContextString str("updateAttachmentOverrides " + getFullname());
 
     LL_DEBUGS("AnimatedObjects") << "updating" << LL_ENDL;
@@ -6023,7 +6016,7 @@ void LLVOAvatar::updateAttachmentOverrides()
     }
 
 
-    if (paranoid_checking)
+#ifdef ATTACHMENT_OVERRIDE_VALIDATION
     {
         std::vector<LLVector3OverrideMap> pos_overrides_by_joint;
         std::vector<LLVector3OverrideMap> scale_overrides_by_joint;
@@ -6074,9 +6067,10 @@ void LLVOAvatar::updateAttachmentOverrides()
         }
         if (mismatched)
         {
-            LL_WARNS() << "MISMATCHED ATTACHMENT OVERRIDES, compare paranoid log files" << LL_ENDL;
+            LL_WARNS() << "MISMATCHED ATTACHMENT OVERRIDES" << LL_ENDL;
         }
     }
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -7027,7 +7021,6 @@ U32 LLVOAvatar::getNumAnimatedObjectAttachments() const
 S32 LLVOAvatar::getMaxAnimatedObjectAttachments() const
 {
     S32 max_attach = 0;
-    // AXON REMOVE AFTER SERVER TESTING DONE
     if (gSavedSettings.getBOOL("AnimatedObjectsIgnoreLimits"))
     {
         max_attach = MAX_AGENT_ATTACHMENTS;