diff options
Diffstat (limited to 'linden/indra/newview/llvoavatar.cpp')
-rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index 10e2ec7..3055c92 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp | |||
@@ -54,7 +54,6 @@ | |||
54 | #include "llkeyframefallmotion.h" | 54 | #include "llkeyframefallmotion.h" |
55 | #include "llkeyframestandmotion.h" | 55 | #include "llkeyframestandmotion.h" |
56 | #include "llkeyframewalkmotion.h" | 56 | #include "llkeyframewalkmotion.h" |
57 | #include "llmanipscale.h" // getMaxPrimSize() | ||
58 | #include "llmutelist.h" | 57 | #include "llmutelist.h" |
59 | #include "llnotify.h" | 58 | #include "llnotify.h" |
60 | #include "llquantize.h" | 59 | #include "llquantize.h" |
@@ -96,7 +95,7 @@ | |||
96 | // [RLVa:KB] | 95 | // [RLVa:KB] |
97 | #include "llstartup.h" | 96 | #include "llstartup.h" |
98 | // [/RLVa:KB] | 97 | // [/RLVa:KB] |
99 | 98 | #include "hippoLimits.h"// getMaxPrimScale | |
100 | using namespace LLVOAvatarDefines; | 99 | using namespace LLVOAvatarDefines; |
101 | 100 | ||
102 | //----------------------------------------------------------------------------- | 101 | //----------------------------------------------------------------------------- |
@@ -1535,7 +1534,7 @@ void LLVOAvatar::getSpatialExtents(LLVector3& newMin, LLVector3& newMax) | |||
1535 | LLVector3 pos = getRenderPosition(); | 1534 | LLVector3 pos = getRenderPosition(); |
1536 | newMin = pos - buffer; | 1535 | newMin = pos - buffer; |
1537 | newMax = pos + buffer; | 1536 | newMax = pos + buffer; |
1538 | float max_attachment_span = LLManipScale::getMaxPrimSize() * 5.0f; | 1537 | float max_attachment_span = gHippoLimits->getMaxPrimScale() * 5.0f; |
1539 | 1538 | ||
1540 | //stretch bounding box by joint positions | 1539 | //stretch bounding box by joint positions |
1541 | for (polymesh_map_t::iterator i = mMeshes.begin(); i != mMeshes.end(); ++i) | 1540 | for (polymesh_map_t::iterator i = mMeshes.begin(); i != mMeshes.end(); ++i) |