diff options
author | McCabe Maxsted | 2009-11-09 16:52:24 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-11-09 16:52:24 -0700 |
commit | 5437f86b14ed724926a3cbb7a444739c264a4969 (patch) | |
tree | 3d461ab60e8f68759d3576917fd66daa6046493b /linden/indra/newview/llvoavatar.cpp | |
parent | Updated streaming video callback in llviewerparcelmedia (diff) | |
download | meta-impy-5437f86b14ed724926a3cbb7a444739c264a4969.zip meta-impy-5437f86b14ed724926a3cbb7a444739c264a4969.tar.gz meta-impy-5437f86b14ed724926a3cbb7a444739c264a4969.tar.bz2 meta-impy-5437f86b14ed724926a3cbb7a444739c264a4969.tar.xz |
Attachment size limits need to use the max prim size set in llmanipscale
Diffstat (limited to 'linden/indra/newview/llvoavatar.cpp')
-rw-r--r-- | linden/indra/newview/llvoavatar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ | |||
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() | ||
57 | #include "llmutelist.h" | 58 | #include "llmutelist.h" |
58 | #include "llnotify.h" | 59 | #include "llnotify.h" |
59 | #include "llquantize.h" | 60 | #include "llquantize.h" |
@@ -1463,7 +1464,7 @@ void LLVOAvatar::getSpatialExtents(LLVector3& newMin, LLVector3& newMax) | |||
1463 | LLVector3 pos = getRenderPosition(); | 1464 | LLVector3 pos = getRenderPosition(); |
1464 | newMin = pos - buffer; | 1465 | newMin = pos - buffer; |
1465 | newMax = pos + buffer; | 1466 | newMax = pos + buffer; |
1466 | float max_attachment_span = DEFAULT_MAX_PRIM_SCALE * 5.0f; | 1467 | float max_attachment_span = LLManipScale::getMaxPrimSize() * 5.0f; |
1467 | 1468 | ||
1468 | //stretch bounding box by joint positions | 1469 | //stretch bounding box by joint positions |
1469 | for (polymesh_map_t::iterator i = mMeshes.begin(); i != mMeshes.end(); ++i) | 1470 | for (polymesh_map_t::iterator i = mMeshes.begin(); i != mMeshes.end(); ++i) |