diff options
| author | leyla_linden <none@none> | 2011-01-28 16:39:02 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-01-28 16:39:02 -0800 |
| commit | fefc37e92fc5313e88fc7416e78fc2436abfffdb (patch) | |
| tree | 69f1a115bf8d06be6b4f54c35176a5eb314948cb /indra/newview/llvoavatar.cpp | |
| parent | ad54a46ba2bc3886f9663bcaa4a6757fac733af7 (diff) | |
SH-808 making sure the 10m vs. 64m scale limit switch happens for both the spinner and the manipulation tools etc.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 4a6d303cdd..dd6f7011a1 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -63,6 +63,7 @@ #include "llkeyframefallmotion.h" #include "llkeyframestandmotion.h" #include "llkeyframewalkmotion.h" +#include "llmanipscale.h" // for get_default_max_prim_scale() #include "llmeshrepository.h" #include "llmutelist.h" #include "llmoveview.h" @@ -1383,7 +1384,7 @@ void LLVOAvatar::getSpatialExtents(LLVector4a& newMin, LLVector4a& newMax) newMin.setSub(pos, buffer); newMax.setAdd(pos, buffer); - float max_attachment_span = DEFAULT_MAX_PRIM_SCALE * 5.0f; + float max_attachment_span = get_default_max_prim_scale() * 5.0f; //stretch bounding box by joint positions for (polymesh_map_t::iterator i = mMeshes.begin(); i != mMeshes.end(); ++i) |