livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -r 71403:72356 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release 

Backport of fixes from production branch. Merge verified with QAR-41
master
Josh Bell 2007-10-25 22:31:09 +00:00
parent ca6f741982
commit 833e8d5c2a
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/lib/python/indra/base/lluuid.py
View File

@ -27,6 +27,7 @@ $/LicenseInfo$
"""
import md5, random, socket, string, time, re
import uuid
def _int2binstr(i,l):
s=''
@ -187,14 +188,8 @@ class UUID(object):
from c++ implementation for portability reasons.
Returns self.
"""
newid = self.__class__.lastid
while newid == self.__class__.lastid:
now = long(time.time() * 1000)
newid = ("%016x" % now) + self.__class__.hexip
newid += ("%03x" % (self.__class__.rand.randrange(0,4095)))
self.__class__.lastid = newid
m = md5.new()
m.update(newid)
m.update(uuid.uuid1().bytes)
self._bits = m.digest()
return self

2
indra/llcommon/llversionserver.h
View File

@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 18;
const S32 LL_VERSION_PATCH = 3;
const S32 LL_VERSION_BUILD = 70368;
const S32 LL_VERSION_BUILD = 71877;
const char * const LL_CHANNEL = "Second Life Server";