diff options
author | Melanie | 2009-12-21 06:29:23 +0000 |
---|---|---|
committer | Melanie | 2009-12-21 06:29:23 +0000 |
commit | f6ef48741303b6e19a5aa73de038b46e0ab409c5 (patch) | |
tree | d2ed7f438da8d1d4e9937aaedac7d884dc0647ea /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
parent | Fix a case where an idle sim can eat 100% of a core (diff) | |
download | opensim-SC_OLD-f6ef48741303b6e19a5aa73de038b46e0ab409c5.zip opensim-SC_OLD-f6ef48741303b6e19a5aa73de038b46e0ab409c5.tar.gz opensim-SC_OLD-f6ef48741303b6e19a5aa73de038b46e0ab409c5.tar.bz2 opensim-SC_OLD-f6ef48741303b6e19a5aa73de038b46e0ab409c5.tar.xz |
Script State Fix: Step 1
Add Engine=xxx attribute and check for it's presence. Ignore state data
written bby another engine
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 6 |
1 files changed, 6 insertions, 0 deletions
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 | |||
1266 | XmlAttribute assetID = doc.CreateAttribute("", "Asset", ""); | 1266 | XmlAttribute assetID = doc.CreateAttribute("", "Asset", ""); |
1267 | assetID.Value = instance.AssetID.ToString(); | 1267 | assetID.Value = instance.AssetID.ToString(); |
1268 | stateData.Attributes.Append(assetID); | 1268 | stateData.Attributes.Append(assetID); |
1269 | XmlAttribute engineName = doc.CreateAttribute("", "Engine", ""); | ||
1270 | engineName.Value = ScriptEngineName; | ||
1271 | stateData.Attributes.Append(engineName); | ||
1269 | doc.AppendChild(stateData); | 1272 | doc.AppendChild(stateData); |
1270 | 1273 | ||
1271 | // Add <ScriptState>...</ScriptState> | 1274 | // Add <ScriptState>...</ScriptState> |
@@ -1388,6 +1391,9 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1388 | 1391 | ||
1389 | XmlElement rootE = (XmlElement)rootL[0]; | 1392 | XmlElement rootE = (XmlElement)rootL[0]; |
1390 | 1393 | ||
1394 | if (rootE.GetAttribute("Engine") != ScriptEngineName) | ||
1395 | return; | ||
1396 | |||
1391 | if (rootE.GetAttribute("UUID") != itemID.ToString()) | 1397 | if (rootE.GetAttribute("UUID") != itemID.ToString()) |
1392 | return; | 1398 | return; |
1393 | 1399 | ||