From cb7abfd595a0be6a36dd3ad8dbec0d9f053210a6 Mon Sep 17 00:00:00 2001
From: Kartic Krishnamurthy <drunkensufi@lindenlab.com>
Date: Thu, 21 Aug 2008 22:09:21 +0000
Subject: [PATCH] Master QAR-807 passed.
Sub-QARs
1. QAR-765 Rad chilies 04 to Release
2. QAR-799 Merge PHP Framework 4 changes to release
3. QAR-801 Merge Buildme for startlocationfix
svn merge -r93906:94028 svn+ssh://svn/svn/linden/branches/combo-merge-qar-765-799 .
---
indra/lib/python/indra/util/fastest_elementtree.py | 4 +---
indra/lib/python/indra/util/named_query.py | 6 +++---
indra/llinventory/llparcel.cpp | 12 +++++++++---
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/indra/lib/python/indra/util/fastest_elementtree.py b/indra/lib/python/indra/util/fastest_elementtree.py
index 66615804633..228be49ed39 100644
--- a/indra/lib/python/indra/util/fastest_elementtree.py
+++ b/indra/lib/python/indra/util/fastest_elementtree.py
@@ -28,9 +28,7 @@
# Using celementree might cause some unforeseen problems so here's a
# convenient off switch.
-
-# *NOTE: turned off cause of problems. :-( *TODO: debug
-use_celementree = False
+use_celementree = True
try:
if not use_celementree:
diff --git a/indra/lib/python/indra/util/named_query.py b/indra/lib/python/indra/util/named_query.py
index 483a9606c8e..1457ff2a308 100644
--- a/indra/lib/python/indra/util/named_query.py
+++ b/indra/lib/python/indra/util/named_query.py
@@ -63,7 +63,7 @@ def _init_g_named_manager(sql_dir = None):
# extra fallback directory in case config doesn't return what we want
if sql_dir is None:
- sql_dir = os.path.dirname(__file__) + "../../../../web/dataservice/sql"
+ sql_dir = os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "web", "dataservice", "sql")
global _g_named_manager
_g_named_manager = NamedQueryManager(
@@ -106,8 +106,8 @@ def __init__(self, name, filename):
a path to a file containing an llsd named query document."""
self._stat_interval_seconds = 5 # 5 seconds
self._name = name
- if (filename is not None) \
- and (NQ_FILE_SUFFIX != filename[-NQ_FILE_SUFFIX_LEN:]):
+ if (filename is not None
+ and NQ_FILE_SUFFIX != filename[-NQ_FILE_SUFFIX_LEN:]):
filename = filename + NQ_FILE_SUFFIX
self._location = filename
self._alternative = dict()
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index 489798910d0..3607318d7f4 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -1761,7 +1761,11 @@ void LLParcel::startSale(const LLUUID& buyer_id, BOOL is_buyer_group)
setCleanOtherTime(0);
}
-void LLParcel::expireSale(U32& type, U8& flags, LLUUID& from_id, LLUUID& to_id)
+void LLParcel::expireSale(
+ U32& type,
+ U8& flags,
+ LLUUID& from_id,
+ LLUUID& to_id)
{
mSaleTimerExpires.setTimerExpirySec(0.0);
mSaleTimerExpires.stop();
@@ -1777,8 +1781,10 @@ void LLParcel::expireSale(U32& type, U8& flags, LLUUID& from_id, LLUUID& to_id)
to_id.setNull();
}
-void LLParcel::completeSale(U32& type, U8& flags,
- LLUUID& to_id)
+void LLParcel::completeSale(
+ U32& type,
+ U8& flags,
+ LLUUID& to_id)
{
mSaleTimerExpires.setTimerExpirySec(0.0);
mSaleTimerExpires.stop();
--
GitLab