From 189599b6ff0c4e6b81e761fbc990c057189359f2 Mon Sep 17 00:00:00 2001 From: Robert Knop Date: Thu, 4 Dec 2008 22:36:34 +0000 Subject: Merging from server/server-1.25 back to trunk. svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 Conflicts resolved by Prospero, except for one scary conflict in SendConfirmationEmail.php which was resolved by jarv. --- indra/lib/python/indra/base/llsd.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'indra/lib/python') diff --git a/indra/lib/python/indra/base/llsd.py b/indra/lib/python/indra/base/llsd.py index 057d4e31dc..e6141b6265 100644 --- a/indra/lib/python/indra/base/llsd.py +++ b/indra/lib/python/indra/base/llsd.py @@ -36,10 +36,13 @@ import re from indra.util.fastest_elementtree import ElementTreeError, fromstring from indra.base import lluuid -try: - import cllsd -except ImportError: - cllsd = None +# cllsd.c in server/server-1.25 has memory leaks, +# so disabling cllsd for now +#try: +# import cllsd +#except ImportError: +# cllsd = None +cllsd = None int_regex = re.compile(r"[-+]?\d+") real_regex = re.compile(r"[-+]?(\d+(\.\d*)?|\d*\.\d+)([eE][-+]?\d+)?") -- cgit v1.2.3