Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a few remaining bugs. Including all settings.

Browse Source
This commit is contained in:
Shyotl
2019-03-18 00:05:59 -05:00
parent b082bce2b1
commit a224c392e8
4 changed files with 110 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
indra/newview/app_settings/settings.xml
View File

@@ -5358,6 +5358,61 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AnimatedObjectsAllowLeftClick</key>
<map>
<key>Comment</key>
<string>Allow left-click interaction with animated objects. Uncertain how much performance impact this will have.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AnimatedObjectsGlobalScale</key>
<map>
<key>Comment</key>
<string>Temporary testing: allow an extra scale factor to be forced on animated objects.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.00</real>
</map>
<key>AnimatedObjectsMaxLegalOffset</key>
<map>
<key>Comment</key>
<string>Max visual offset between object position and rendered position</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>3.0</real>
</map>
<key>AnimatedObjectsMaxLegalSize</key>
<map>
<key>Comment</key>
<string>Max bounding box size for animated object's rendered position</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>64.0</real>
</map>
<key>AvatarBoundingBoxComplexity</key>
<map>
<key>Comment</key>
<string>How many aspects to consider for avatar bounding box</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>3</integer>
</map>
<key>DebugAvatarAppearanceMessage</key>
<map>
<key>Comment</key>
@@ -12475,6 +12530,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AlwaysRenderFriends</key>
<map>
<key>Comment</key>
<string>Always render friends regardless of max complexity</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RenderAvatarCloth</key>
<map>
<key>Comment</key>
@@ -14193,18 +14259,42 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RenderAutoMuteSurfaceAreaLimit</key>
<key>MaxAttachmentComplexity</key>
<map>
<key>Comment</key>
<string>Maximum surface area of attachments before an avatar is automatically visually muted (0 for no limit).</string>
<string>Attachment's render weight limit</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>1.0E6</real>
</map>
<key>RenderAvatarMaxComplexity</key>
<map>
<key>Comment</key>
<string>Maximum Avatar Complexity; above this value, the avatar is
rendered as a solid color outline (0 to disable this limit).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RenderAutoMuteSurfaceAreaLimit</key>
<map>
<key>Comment</key>
<string>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).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0</real>
</map>
<key>RenderAutoMuteLogging</key>
<map>
<key>Comment</key>

11
indra/newview/app_settings/settings_sh.xml
View File

@@ -273,5 +273,16 @@
<key>Value</key>
<real>0</real>
</map>
<key>SHSkipResetVBOsOnTeleport</key>
<map>
<key>Comment</key>
<string>Skip VBO auto-recreation upon teleport. Setting to true may help avoid attachments dissipearing on teleport.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<real>0</real>
</map>
</map>
</llsd>

7
indra/newview/llagent.cpp
View File

@@ -4015,15 +4015,16 @@ bool LLAgent::teleportCore(bool is_local)
gTeleportDisplay = TRUE;
gAgent.setTeleportState( LLAgent::TELEPORT_START );
/*static const LLCachedControl<bool> hide_tp_screen("AscentDisableTeleportScreens",false);
if(!hide_tp_screen)
static const LLCachedControl<bool> hide_tp_screen("AscentDisableTeleportScreens",false);
static const LLCachedControl<bool> 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"))
{

4
indra/newview/llvoavatar.cpp
View File

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