summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewerobject.cpp9
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_stats.xml88
2 files changed, 33 insertions, 64 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 8092eda7b2..9235f23a8c 100755
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2439,7 +2439,7 @@ void LLViewerObject::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
// Move an object due to idle-time viewer side updates by interpolating motion
-void LLViewerObject::interpolateLinearMotion(const F64SecondsImplicit& time, const F32SecondsImplicit& dt)
+void LLViewerObject::interpolateLinearMotion(const F64SecondsImplicit& time, const F32SecondsImplicit& dt_seconds)
{
// linear motion
// PHYSICS_TIMESTEP is used below to correct for the fact that the velocity in object
@@ -2450,8 +2450,9 @@ void LLViewerObject::interpolateLinearMotion(const F64SecondsImplicit& time, con
// to see if object is selected, instead of explicitly
// zeroing it out
+ F32 dt = dt_seconds;
F64Seconds time_since_last_update = time - mLastMessageUpdateSecs;
- if (time_since_last_update <= (F64Seconds)0.0 || dt <= (F32Seconds)0.f)
+ if (time_since_last_update <= (F64Seconds)0.0 || dt <= 0.f)
{
return;
}
@@ -2463,7 +2464,7 @@ void LLViewerObject::interpolateLinearMotion(const F64SecondsImplicit& time, con
{ // Old code path ... unbounded, simple interpolation
if (!(accel.isExactlyZero() && vel.isExactlyZero()))
{
- LLVector3 pos = (vel + (0.5f * (dt-PHYSICS_TIMESTEP)) * accel) * dt.value();
+ LLVector3 pos = (vel + (0.5f * (dt-PHYSICS_TIMESTEP)) * accel) * dt;
// region local
setPositionRegion(pos + getPositionRegion());
@@ -2477,7 +2478,7 @@ void LLViewerObject::interpolateLinearMotion(const F64SecondsImplicit& time, con
{ // Object is moving, and hasn't been too long since we got an update from the server
// Calculate predicted position and velocity
- LLVector3 new_pos = (vel + (0.5f * (dt-PHYSICS_TIMESTEP)) * accel) * dt.value();
+ LLVector3 new_pos = (vel + (0.5f * (dt-PHYSICS_TIMESTEP)) * accel) * dt;
LLVector3 new_v = accel * dt;
if (time_since_last_update > sPhaseOutUpdateInterpolationTime &&
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index fc2369276c..02d1bf6a0e 100755
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -42,8 +42,7 @@
show_bar="true"/>
<stat_bar name="packet_loss"
label="Packet Loss"
- stat="packetslostpercentstat"
- decimal_digits="3"/>
+ stat="packetslostpercentstat"/>
<stat_bar name="ping"
label="Ping Sim"
stat="simpingstat"/>
@@ -71,12 +70,10 @@
stat="numobjectsstat"/>
<stat_bar name="newobjs"
label="New Objects"
- stat="numnewobjectsstat"
- bar_max="2000"/>
+ stat="numnewobjectsstat"/>
<stat_bar name="object_cache_hits"
label="Object Cache Hit Rate"
stat="object_cache_hits"
- bar_max="100"
show_history="true"/>
</stat_view>
<stat_view name="texture"
@@ -86,7 +83,6 @@
<stat_bar name="texture_cache_hits"
label="Cache Hit Rate"
stat="texture_cache_hits"
- bar_max="100"
show_history="true"/>
<stat_bar name="texture_cache_read_latency"
label="Cache Read Latency"
@@ -100,20 +96,16 @@
stat="numrawimagesstat"/>
<stat_bar name="gltexmemstat"
label="GL Mem"
- stat="gltexmemstat"
- decimal_digits="1"/>
+ stat="gltexmemstat"/>
<stat_bar name="formattedmemstat"
label="Formatted Mem"
- stat="formattedmemstat"
- decimal_digits="3"/>
+ stat="formattedmemstat"/>
<stat_bar name="rawmemstat"
label="Raw Mem"
- stat="rawmemstat"
- decimal_digits="3"/>
+ stat="rawmemstat"/>
<stat_bar name="glboundmemstat"
label="Bound Mem"
- stat="glboundmemstat"
- decimal_digits="3"/>
+ stat="glboundmemstat"/>
</stat_view>
<stat_view name="network"
@@ -168,9 +160,7 @@
setting="OpenDebugStatSim">
<stat_bar name="simtimedilation"
label="Time Dilation"
- stat="simtimedilation"
- decimal_digits="3"
- bar_max="1" />
+ stat="simtimedilation"/>
<stat_bar name="simfps"
label="Sim FPS"
stat="simfps"
@@ -202,28 +192,22 @@
decimal_digits="1"/>
<stat_bar name="simmainagents"
label="Main Agents"
- stat="simmainagents"
- bar_max="80"/>
+ stat="simmainagents"/>
<stat_bar name="simchildagents"
label="Child Agents"
stat="simchildagents"/>
<stat_bar name="simobjects"
label="Objects"
- stat="simobjects"
- bar_max="30000" />
+ stat="simobjects"/>
<stat_bar name="simactiveobjects"
label="Active Objects"
- stat="simactiveobjects"
- bar_max="5000"/>
+ stat="simactiveobjects"/>
<stat_bar name="simactivescripts"
label="Active Scripts"
- stat="simactivescripts"
- bar_max="15000"/>
+ stat="simactivescripts"/>
<stat_bar name="simpctscriptsrun"
label="Scripts Run"
- stat="simpctscriptsrun"
- bar_max="100"
- decimal_digits="3"/>
+ stat="simpctscriptsrun"/>
<stat_bar name="simscripteps"
label="Script Events"
stat="simscripteps"
@@ -234,16 +218,13 @@
show_label="true">
<stat_bar name="simsimaistepmsec"
label="AI Step Time"
- stat="simsimaistepmsec"
- decimal_digits="3"/>
+ stat="simsimaistepmsec"/>
<stat_bar name="simsimskippedsilhouettesteps"
label="Skipped Silhouette Steps"
stat="simsimskippedsilhouettesteps"
- unit_label="/sec"
- bar_max="45"/>
+ unit_label="/sec"/>
<stat_bar name="simsimpctsteppedcharacters"
stat="simsimpctsteppedcharacters"
- bar_max="100"
decimal_digits="1"/>
</stat_view>
<stat_bar name="siminpps"
@@ -261,7 +242,7 @@
label="Pending Uploads"
stat="simpendinguploads"/>
<stat_bar name="simtotalunackedbytes"
- label="Total Unacked Bytes"
+ label="Total Unacked Data"
stat="simtotalunackedbytes"
decimal_digits="1"/>
<stat_view name="simperf"
@@ -270,60 +251,47 @@
show_label="true">
<stat_bar name="simframemsec"
label="Total Frame Time"
- stat="simframemsec"
- decimal_digits="3"/>
+ stat="simframemsec"/>
<stat_bar name="simnetmsec"
label="Net Time"
- stat="simnetmsec"
- decimal_digits="3"/>
+ stat="simnetmsec"/>
<stat_bar name="simsimphysicsmsec"
label="Physics Time"
- stat="simsimphysicsmsec"
- decimal_digits="3"/>
+ stat="simsimphysicsmsec"/>
<stat_bar name="simsimothermsec"
label="Simulation Time"
- stat="simsimothermsec"
- decimal_digits="3"/>
+ stat="simsimothermsec"/>
<stat_bar name="simagentmsec"
label="Agent Time"
- stat="simagentmsec"
- decimal_digits="3"/>
+ stat="simagentmsec"/>
<stat_bar name="simimagesmsec"
label="Images Time"
- stat="simimagesmsec"
- decimal_digits="3"/>
+ stat="simimagesmsec"/>
<stat_bar name="simscriptmsec"
label="Script Time"
- stat="simscriptmsec"
- decimal_digits="3"/>
+ stat="simscriptmsec"/>
<stat_bar name="simsparemsec"
label="Spare Time"
- stat="simsparemsec"
- decimal_digits="3"/>
+ stat="simsparemsec"/>
<stat_view name="timedetails"
label="Time Details"
follows="left|top|right"
show_label="true">
<stat_bar name="simsimphysicsstepmsec"
label="Physics Step"
- stat="simsimphysicsstepmsec"
- decimal_digits="3"/>
+ stat="simsimphysicsstepmsec"/>
<stat_bar name="simsimphysicsshapeupdatemsec"
label="Update Phys Shapes"
- stat="simsimphysicsshapeupdatemsec"
- decimal_digits="3"/>
+ stat="simsimphysicsshapeupdatemsec"/>
<stat_bar name="simsimphysicsothermsec"
label="Physics Other"
- stat="simsimphysicsothermsec"
- decimal_digits="3"/>
+ stat="simsimphysicsothermsec"/>
<stat_bar name="simsleepmsec"
label="Sleep Time"
- stat="simsleepmsec"
- decimal_digits="3"/>
+ stat="simsleepmsec"/>
<stat_bar name="simpumpiomsec"
label="Pump IO"
- stat="simpumpiomsec"
- decimal_digits="3"/>
+ stat="simpumpiomsec"/>
</stat_view>
</stat_view>
</stat_view>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 01:31:16 +0000