diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-21 09:11:01 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-21 09:11:01 -0500 |
| commit | 052d8a8f2eeb4501a62096e2565f377a03f6a609 (patch) | |
| tree | e5c5230a5da7d24fcd536883a7b3bb4deac12717 | |
| parent | 8fef9576189f6e3bfb2e1ec0bc2b770186f26c5d (diff) | |
| parent | 93e3617e8b409a7517f04b3607080f11274a5fd9 (diff) | |
merge changes for storm-1679
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index e491df284e..171b791a61 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -584,6 +584,7 @@ Jonathan Yap STORM-910 STORM-1642 STORM-1105 + STORM-1679 STORM-1222 STORM-1659 STORM-1674 diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index bdab250b49..6af800f1d7 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -8335,7 +8335,7 @@ void LLVOAvatar::getImpostorValues(LLVector4a* extents, LLVector3& angle, F32& d void LLVOAvatar::idleUpdateRenderCost() { static const U32 ARC_BODY_PART_COST = 200; - static const U32 ARC_LIMIT = 2048; + static const U32 ARC_LIMIT = 20000; static std::set<LLUUID> all_textures; |