From 424e8687e443aad1b76be5ec54fee0ba9f22ef65 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 11 Nov 2013 15:25:46 -0500 Subject: Added tag 3.6.10-release for changeset 5b54b36862ff --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index c81c919d1a..d598ff1f62 100755 --- a/.hgtags +++ b/.hgtags @@ -468,3 +468,4 @@ bf6d453046011a11de2643fac610cc5258650f82 3.6.5-release ae457ece77001767ae9613148c495e7b98cc0f4a 3.6.7-release d40c66e410741de7e90b1ed6dac28dd8a2d7e1f6 3.6.8-release 70eda3721d36df3e00730629c42a1304e5bc65b8 3.6.9-release +5b54b36862ff8bc3b6935673c9d1c1f22ee8d521 3.6.10-release -- cgit v1.2.3 From b8cafb8e850c9bc65f61202d6caba5725a33aef7 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 11 Nov 2013 15:26:19 -0500 Subject: increment viewer version to 3.6.11 --- indra/newview/VIEWER_VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index c47e8b5872..e8b6c77dc9 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -3.6.10 +3.6.11 -- cgit v1.2.3 From ebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 11 Nov 2013 15:26:55 -0500 Subject: convert dos line endings --- indra/newview/llvovolume.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 8677c02829..dfac77857c 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -335,13 +335,13 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys, { mTextureAnimp = new LLViewerTextureAnim(this); } - else - { - if (!(mTextureAnimp->mMode & LLTextureAnim::SMOOTH)) - { - mTextureAnimp->reset(); - } - } + else + { + if (!(mTextureAnimp->mMode & LLTextureAnim::SMOOTH)) + { + mTextureAnimp->reset(); + } + } mTexAnimMode = 0; mTextureAnimp->unpackTAMessage(mesgsys, block_num); -- cgit v1.2.3