From 9c4a2547b928beb167df133994dfe453f95cddb3 Mon Sep 17 00:00:00 2001 From: Boroondas Gupte Date: Sun, 29 Aug 2010 18:32:20 +0200 Subject: SNOW-737 FIXED Version agnostic libPNG linking Patch from http://jira.secondlife.com/secure/attachment/41125/version_agnostic_libpng__1.diff applied with fuzz 3: patching file indra/cmake/PNG.cmake Hunk #1 succeeded at 6 with fuzz 3 (offset -2 lines). patching file indra/llimage/llpngwrapper.cpp Hunk #1 succeeded at 215 (offset -2 lines). Hunk #2 succeeded at 363 (offset -2 lines). patching file indra/llimage/llpngwrapper.h Hunk #1 succeeded at 31 (offset -2 lines). Added entry in doc/contributions.txt. No further changes other than that. --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 2a37015b01..9354bc0c68 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -68,6 +68,7 @@ Blakar Ogre blino Nakamura VWR-17 Boroondas Gupte + SNOW-737 VWR-233 WEB-262 bushing Spatula -- cgit v1.3 From 5215bf9925f1cecb64b04ab8ab226b63be65227c Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 16 Sep 2010 20:01:35 -0400 Subject: [STORM-175] Fix Ping Interpolate Object Position --- doc/contributions.txt | 2 ++ indra/newview/llviewerobject.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 5892a8081d..53a7d92b86 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -645,6 +645,7 @@ Teardrops Fall Techwolf Lupindo SNOW-92 SNOW-649 + SNOW-687 SNOW-680 SNOW-681 SNOW-690 @@ -655,6 +656,7 @@ Tharax Ferraris VWR-605 Thickbrick Sleaford SNOW-207 + SNOW-390 SNOW-421 SNOW-462 SNOW-586 diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 25cc24da95..741a9e6ec4 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -1844,7 +1844,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys, if (cdp) { F32 ping_delay = 0.5f * mTimeDilation * ( ((F32)cdp->getPingDelay()) * 0.001f + gFrameDTClamped); - LLVector3 diff = getVelocity() * (0.5f*mTimeDilation*(gFrameDTClamped + ((F32)ping_delay)*0.001f)); + LLVector3 diff = getVelocity() * ping_delay; new_pos_parent += diff; } else -- cgit v1.3