From c894356bcd1ee0ada7f9ec5ab7edfa71d5ddb965 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 2 Sep 2015 10:53:29 -0400 Subject: request that tpvs not change avatar complexity calculation --- indra/newview/llvoavatar.cpp | 6 ++++++ indra/newview/llvovolume.cpp | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 5d83a20f50..9e689d9821 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -8305,6 +8305,12 @@ void LLVOAvatar::updateVisualComplexity() // Calculations for mVisualComplexity value void LLVOAvatar::calculateUpdateRenderComplexity() { + /***************************************************************** + * This calculation should not be modified by third party viewers, + * since it is used to limit rendering and should be uniform for + * everyone. If you have suggested improvements, submit them to + * the official viewer for consideration. + *****************************************************************/ static const U32 COMPLEXITY_BODY_PART_COST = 200; // Diagnostic list of all textures on our avatar diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 44ba09c171..2f7dd88e20 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -3343,6 +3343,13 @@ const LLMatrix4 LLVOVolume::getRenderMatrix() const // children, and cost should only be increased for unique textures -Nyx U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const { + /***************************************************************** + * This calculation should not be modified by third party viewers, + * since it is used to limit rendering and should be uniform for + * everyone. If you have suggested improvements, submit them to + * the official viewer for consideration. + *****************************************************************/ + // Get access to params we'll need at various points. // Skip if this is object doesn't have a volume (e.g. is an avatar). BOOL has_volume = (getVolume() != NULL); -- cgit v1.2.3 From e4f7db7fec74a020bf7e2783a8d051e2cdcd7dab Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 2 Sep 2015 14:09:53 -0400 Subject: MAINT-5570: add explanation links to complexity messages (using temporary wiki links) --- indra/newview/skins/default/xui/en/notifications.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index e603e0aebe..394ea5f0b1 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3301,7 +3301,7 @@ You can use [SECOND_LIFE] normally and other people will see you correctly. AgentComplexityNotice - Your visual complexity is [AGENT_COMPLEXITY]. +Your [https://wiki.secondlife.com/wiki/Avatar_Rendering_Complexity visual complexity] is [AGENT_COMPLEXITY]. [OVERLIMIT_MSG] @@ -3313,7 +3313,7 @@ You can use [SECOND_LIFE] normally and other people will see you correctly. AgentComplexityNotice -Your visual complexity is [AGENT_COMPLEXITY]. +Your [https://wiki.secondlife.com/wiki/Avatar_Rendering_Complexity visual complexity] is [AGENT_COMPLEXITY].