From f44340a6b424522729c6cce2761e4df1713b9035 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Mon, 15 Oct 2012 16:34:29 -0700
Subject: MAINT-1672: Correcting issue where the sailboat boom was not moving
correctly. The isssue was that the display text for the prim was being
updated, and this code path would mark the prim as having been moved when, in
fact, the pipeline had not yet moved the object.
---
indra/newview/llviewerobject.cpp | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 1447f133e6..75d36d3463 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -1236,12 +1236,8 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
coloru.mV[3] = 255 - coloru.mV[3];
mText->setColor(LLColor4(coloru));
mText->setString(temp_string);
-
- if (mDrawable.notNull())
- {
- setChanged(MOVED | SILHOUETTE);
- gPipeline.markMoved(mDrawable, FALSE); // undamped
- }
+
+ setChanged(MOVED | SILHOUETTE);
}
else if (mText.notNull())
{
@@ -2101,7 +2097,6 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
setChanged(ROTATED | SILHOUETTE);
}
-
if ( gShowObjectUpdates )
{
LLColor4 color;
--
cgit v1.2.3
From b10b7833ee160fa05a70922bffc191829bf0fb21 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 9 Nov 2012 17:55:44 -0800
Subject: MAINT-1755: Correcting behavior when llTargetOmega is called with
zero spin rate.
---
indra/newview/llviewerobject.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index bde4676eb4..b2bd547811 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2042,12 +2042,12 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
|| (new_angv != old_angv))
{
if (new_rot != mPreviousRotation)
- {
+ {
resetRot();
}
else if (new_angv != old_angv)
{
- if (flagUsePhysics() || new_angv.isExactlyZero())
+ if (flagUsePhysics())
{
resetRot();
}
--
cgit v1.2.3