diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index 0ac8b5c..5c4174e 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
@@ -97,13 +97,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
97 | return; | 97 | return; |
98 | 98 | ||
99 | m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount); | 99 | m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount); |
100 | if (part.ParentGroup != null) | ||
101 | part = part.ParentGroup.RootPart; | ||
102 | 100 | ||
103 | if (part != null) | 101 | part = part.ParentGroup.RootPart; |
104 | { | 102 | money(part.LocalId, agentID, amount); |
105 | money(part.LocalId, agentID, amount); | ||
106 | } | ||
107 | } | 103 | } |
108 | 104 | ||
109 | /// <summary> | 105 | /// <summary> |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 4f3432d..9cb074a 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -1373,9 +1373,15 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1373 | 1373 | ||
1374 | public string GetXMLState(UUID itemID) | 1374 | public string GetXMLState(UUID itemID) |
1375 | { | 1375 | { |
1376 | // m_log.DebugFormat("[XEngine]: Getting XML state for {0}", itemID); | ||
1377 | |||
1376 | IScriptInstance instance = GetInstance(itemID); | 1378 | IScriptInstance instance = GetInstance(itemID); |
1377 | if (instance == null) | 1379 | if (instance == null) |
1380 | { | ||
1381 | // m_log.DebugFormat("[XEngine]: Found no script for {0}, returning empty string", itemID); | ||
1378 | return ""; | 1382 | return ""; |
1383 | } | ||
1384 | |||
1379 | string xml = instance.GetXMLState(); | 1385 | string xml = instance.GetXMLState(); |
1380 | 1386 | ||
1381 | XmlDocument sdoc = new XmlDocument(); | 1387 | XmlDocument sdoc = new XmlDocument(); |
@@ -1516,6 +1522,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1516 | mapData.InnerText = map; | 1522 | mapData.InnerText = map; |
1517 | 1523 | ||
1518 | stateData.AppendChild(mapData); | 1524 | stateData.AppendChild(mapData); |
1525 | |||
1526 | // m_log.DebugFormat("[XEngine]: Got XML state for {0}", itemID); | ||
1527 | |||
1519 | return doc.InnerXml; | 1528 | return doc.InnerXml; |
1520 | } | 1529 | } |
1521 | 1530 | ||