2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 159343d..8154609 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -4,6 +4,11 @@
 
 2009-11-09 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Attachment size limits need to use the max prim size set in llmanipscale.
+        
+          modified:   linden/indra/newview/llvoavatar.cpp
+          
+          
         * Updated streaming video callback in llviewerparcelmedia.
         
           modified:   linden/indra/newview/llviewerparcelmedia.cpp
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 225ef2e..1fa7cf0 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -54,6 +54,7 @@
 #include "llkeyframefallmotion.h"
 #include "llkeyframestandmotion.h"
 #include "llkeyframewalkmotion.h"
+#include "llmanipscale.h" // getMaxPrimSize()
 #include "llmutelist.h"
 #include "llnotify.h"
 #include "llquantize.h"
@@ -1463,7 +1464,7 @@ void LLVOAvatar::getSpatialExtents(LLVector3& newMin, LLVector3& newMax)
         LLVector3 pos = getRenderPosition();
         newMin = pos - buffer;
         newMax = pos + buffer;
-        float max_attachment_span = DEFAULT_MAX_PRIM_SCALE * 5.0f;
+        float max_attachment_span = LLManipScale::getMaxPrimSize() * 5.0f;
         
         //stretch bounding box by joint positions
         for (polymesh_map_t::iterator i = mMeshes.begin(); i != mMeshes.end(); ++i)