From 225ad147a03e569cda1177074cea49035dc7636c Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 29 Jun 2009 17:25:47 -0500 Subject: Updated URL for Mac OpenAL libs package. --- linden/install.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linden') diff --git a/linden/install.xml b/linden/install.xml index 41eec44..250ce46 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -843,7 +843,7 @@ anguage Infrstructure (CLI) international standard md5sum f30b851e089108978c8218295a405159 url - http://thomas.shikami.mooo.com/install_pkgs/openal-darwin-20090418.tar.bz2 + http://imprudenceviewer.org/download/libs/openal-darwin-20090418.tar.bz2 linux -- cgit v1.1 From 428d872be7b0896f85dd5bbd83df8a2d2f429b42 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 3 Sep 2009 00:59:17 -0500 Subject: Updated some python scripts to not use deprecated modules. --- linden/indra/lib/python/indra/base/lluuid.py | 5 +++-- linden/indra/lib/python/indra/ipc/llmessage.py | 6 ++---- linden/scripts/install.py | 6 ++---- 3 files changed, 7 insertions(+), 10 deletions(-) (limited to 'linden') diff --git a/linden/indra/lib/python/indra/base/lluuid.py b/linden/indra/lib/python/indra/base/lluuid.py index aceea29..40ce818 100644 --- a/linden/indra/lib/python/indra/base/lluuid.py +++ b/linden/indra/lib/python/indra/base/lluuid.py @@ -26,7 +26,8 @@ THE SOFTWARE. $/LicenseInfo$ """ -import md5, random, socket, string, time, re +import random, socket, string, time, re +from hashlib import md5 import uuid def _int2binstr(i,l): @@ -196,7 +197,7 @@ class UUID(object): from c++ implementation for portability reasons. Returns self. """ - m = md5.new() + m = md5() m.update(uuid.uuid1().bytes) self._bits = m.digest() return self diff --git a/linden/indra/lib/python/indra/ipc/llmessage.py b/linden/indra/lib/python/indra/ipc/llmessage.py index 6161bad..91fb36b 100644 --- a/linden/indra/lib/python/indra/ipc/llmessage.py +++ b/linden/indra/lib/python/indra/ipc/llmessage.py @@ -26,8 +26,6 @@ THE SOFTWARE. $/LicenseInfo$ """ -from sets import Set, ImmutableSet - from compatibility import Incompatible, Older, Newer, Same from tokenstream import TokenStream @@ -44,8 +42,8 @@ class Template: def compatibleWithBase(self, base): messagenames = ( - ImmutableSet(self.messages.keys()) - | ImmutableSet(base.messages.keys()) + frozenset(self.messages.keys()) + | frozenset(base.messages.keys()) ) compatibility = Same() diff --git a/linden/scripts/install.py b/linden/scripts/install.py index f886a6e..3843c83 100755 --- a/linden/scripts/install.py +++ b/linden/scripts/install.py @@ -34,7 +34,7 @@ $/LicenseInfo$ """ import copy -import md5 +from hashlib import md5 import optparse import os import platform @@ -46,8 +46,6 @@ import tempfile import urllib2 import urlparse -from sets import Set as set, ImmutableSet as frozenset - # Locate -our- python library relative to our install location. from os.path import realpath, dirname, join @@ -76,7 +74,7 @@ class InstallFile(object): return "ifile{%s:%s}" % (self.pkgname, self.url) def _is_md5sum_match(self): - hasher = md5.new(file(self.filename, 'rb').read()) + hasher = md5(file(self.filename, 'rb').read()) if hasher.hexdigest() == self.md5sum: return True return False -- cgit v1.1 From e48baec95692e2df5ad836486444130d578df260 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 3 Sep 2009 19:08:42 -0500 Subject: Backported 1.23 fix for animation joint assertion crash. --- linden/indra/llcharacter/llkeyframemotion.cpp | 37 +++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) (limited to 'linden') diff --git a/linden/indra/llcharacter/llkeyframemotion.cpp b/linden/indra/llcharacter/llkeyframemotion.cpp index 212020b..4b138b1 100644 --- a/linden/indra/llcharacter/llkeyframemotion.cpp +++ b/linden/indra/llcharacter/llkeyframemotion.cpp @@ -1560,6 +1560,13 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp) } constraintp->mChainLength = (S32) byte; + if((U32)constraintp->mChainLength > mJointMotionList->getNumJointMotions()) + { + llwarns << "invalid constraint chain length" << llendl; + delete constraintp; + return FALSE; + } + if (!dp.unpackU8(byte, "constraint_type")) { llwarns << "can't read constraint type" << llendl; @@ -1587,7 +1594,14 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp) delete constraintp; return FALSE; } - + + if( !(constraintp->mSourceConstraintOffset.isFinite()) ) + { + llwarns << "non-finite constraint source offset" << llendl; + delete constraintp; + return FALSE; + } + if (!dp.unpackBinaryDataFixed(bin_data, BIN_DATA_LENGTH, "target_volume")) { llwarns << "can't read target volume name" << llendl; @@ -1615,6 +1629,13 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp) return FALSE; } + if( !(constraintp->mTargetConstraintOffset.isFinite()) ) + { + llwarns << "non-finite constraint target offset" << llendl; + delete constraintp; + return FALSE; + } + if (!dp.unpackVector3(constraintp->mTargetConstraintDir, "target_dir")) { llwarns << "can't read constraint target direction" << llendl; @@ -1622,6 +1643,13 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp) return FALSE; } + if( !(constraintp->mTargetConstraintDir.isFinite()) ) + { + llwarns << "non-finite constraint target direction" << llendl; + delete constraintp; + return FALSE; + } + if (!constraintp->mTargetConstraintDir.isExactlyZero()) { constraintp->mUseTargetOffset = TRUE; @@ -1685,8 +1713,13 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp) break; } } + if (constraintp->mJointStateIndices[i] < 0 ) + { + llwarns << "No joint index for constraint " << i << llendl; + delete constraintp; + return FALSE; + } } - } } -- cgit v1.1