diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 9d6846127..79316b2f4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5358,6 +5358,61 @@ This should be as low as possible, but too low may break functionality Value 0 + AnimatedObjectsAllowLeftClick + + Comment + Allow left-click interaction with animated objects. Uncertain how much performance impact this will have. + Persist + 1 + Type + Boolean + Value + 0 + + AnimatedObjectsGlobalScale + + Comment + Temporary testing: allow an extra scale factor to be forced on animated objects. + Persist + 1 + Type + F32 + Value + 1.00 + + AnimatedObjectsMaxLegalOffset + + Comment + Max visual offset between object position and rendered position + Persist + 1 + Type + F32 + Value + 3.0 + + AnimatedObjectsMaxLegalSize + + Comment + Max bounding box size for animated object's rendered position + Persist + 1 + Type + F32 + Value + 64.0 + + AvatarBoundingBoxComplexity + + Comment + How many aspects to consider for avatar bounding box + Persist + 1 + Type + S32 + Value + 3 + DebugAvatarAppearanceMessage Comment @@ -12475,6 +12530,17 @@ This should be as low as possible, but too low may break functionality Value 1 + AlwaysRenderFriends + + Comment + Always render friends regardless of max complexity + Persist + 1 + Type + Boolean + Value + 0 + RenderAvatarCloth Comment @@ -14193,18 +14259,42 @@ This should be as low as possible, but too low may break functionality Value 0 - RenderAutoMuteSurfaceAreaLimit + MaxAttachmentComplexity Comment - Maximum surface area of attachments before an avatar is automatically visually muted (0 for no limit). + Attachment's render weight limit Persist 1 Type F32 Value + 1.0E6 + + RenderAvatarMaxComplexity + + Comment + Maximum Avatar Complexity; above this value, the avatar is + rendered as a solid color outline (0 to disable this limit). + Persist + 1 + Type + U32 + Value 0 - + RenderAutoMuteSurfaceAreaLimit + + Comment + Maximum surface area of attachments before an avatar is + rendered as a simple impostor (to not use this limit, set to zero + or set RenderAvatarMaxComplexity to zero). + Persist + 1 + Type + F32 + Value + 0 + RenderAutoMuteLogging Comment diff --git a/indra/newview/app_settings/settings_sh.xml b/indra/newview/app_settings/settings_sh.xml index e2c8a5fb7..f9b11e704 100644 --- a/indra/newview/app_settings/settings_sh.xml +++ b/indra/newview/app_settings/settings_sh.xml @@ -273,5 +273,16 @@ Value 0 + SHSkipResetVBOsOnTeleport + + Comment + Skip VBO auto-recreation upon teleport. Setting to true may help avoid attachments dissipearing on teleport. + Persist + 1 + Type + Boolean + Value + 0 + diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 498e3755c..c447a4925 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4015,15 +4015,16 @@ bool LLAgent::teleportCore(bool is_local) gTeleportDisplay = TRUE; gAgent.setTeleportState( LLAgent::TELEPORT_START ); - /*static const LLCachedControl hide_tp_screen("AscentDisableTeleportScreens",false); - if(!hide_tp_screen) + static const LLCachedControl hide_tp_screen("AscentDisableTeleportScreens",false); + static const LLCachedControl skip_reset_objects_on_teleport("SHSkipResetVBOsOnTeleport", false); + if(!hide_tp_screen && !skip_reset_objects_on_teleport) { // AscentDisableTeleportScreens TRUE might be broken..*/ //release geometry from old location gPipeline.resetVertexBuffers(); LLSpatialPartition::sTeleportRequested = TRUE; - /*}*/ + } if (gSavedSettings.getBOOL("SpeedRez")) { diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 3c3d884ec..41464fba0 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -328,7 +328,7 @@ const F32 NAMETAG_VERT_OFFSET_WEIGHT = 0.17f; const U32 LLVOAvatar::VISUAL_COMPLEXITY_UNKNOWN = 0; const F64 HUD_OVERSIZED_TEXTURE_DATA_SIZE = 1024 * 1024; -#define SLOW_ATTACHMENT_LIST 1 +#define SLOW_ATTACHMENT_LIST 0 //Singu note: FADE and ALWAYS are swapped around from LL's source to match our preference panel. // Changing the "RenderName" order would cause confusion when 'always' setting suddenly gets @@ -1813,7 +1813,7 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax) { static const LLVector4Logical mask = _mm_load_ps((F32*)&S_V4LOGICAL_MASK_TABLE[3 * 4]); LLVector4a trans; - trans.setSelectWithMask(mask, mesh->mJointRenderData[joint_num]->mWorldMatrix->getRow<3>(), _mm_setzero_ps()); + trans.setSelectWithMask(mask, _mm_setzero_ps(), mesh->mJointRenderData[joint_num]->mWorldMatrix->getRow<3>()); update_min_max(newMin, newMax, trans); } }