livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for storm-1679

master
Oz Linden 2011-11-21 09:11:01 -05:00
parent 8fef957618 93e3617e8b
commit 052d8a8f2e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -584,6 +584,7 @@ Jonathan Yap
STORM-910
STORM-1642
STORM-1105
STORM-1679
STORM-1222
STORM-1659
STORM-1674

2
indra/newview/llvoavatar.cpp
View File

@ -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;