From f6ef48741303b6e19a5aa73de038b46e0ab409c5 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 21 Dec 2009 06:29:23 +0000
Subject: Script State Fix: Step 1 Add Engine=xxx attribute and check for it's
 presence. Ignore state data written bby another engine

---
 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 9030a5c..20dbbd4 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1266,6 +1266,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             XmlAttribute assetID = doc.CreateAttribute("", "Asset", "");
             assetID.Value = instance.AssetID.ToString();
             stateData.Attributes.Append(assetID);
+            XmlAttribute engineName = doc.CreateAttribute("", "Engine", "");
+            engineName.Value = ScriptEngineName;
+            stateData.Attributes.Append(engineName);
             doc.AppendChild(stateData);
 
             // Add <ScriptState>...</ScriptState>
@@ -1388,6 +1391,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             XmlElement rootE = (XmlElement)rootL[0];
 
+            if (rootE.GetAttribute("Engine") != ScriptEngineName)
+                return;
+
             if (rootE.GetAttribute("UUID") != itemID.ToString())
                 return;
 
-- 
cgit v1.1