aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2009-12-21 06:41:10 +0000
committerMelanie2009-12-21 06:41:10 +0000
commit83d8ba5775146da220b7e60d3779810db8a1eb5d (patch)
treeb60f6a04d621064625b2263dd007d97072983f0a /OpenSim
parentScript State Fix: Step 1 (diff)
downloadopensim-SC_OLD-83d8ba5775146da220b7e60d3779810db8a1eb5d.zip
opensim-SC_OLD-83d8ba5775146da220b7e60d3779810db8a1eb5d.tar.gz
opensim-SC_OLD-83d8ba5775146da220b7e60d3779810db8a1eb5d.tar.bz2
opensim-SC_OLD-83d8ba5775146da220b7e60d3779810db8a1eb5d.tar.xz
Remove extra checking on the itemID of saved state, since it changes during
rez from inventory.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 20dbbd4..082c99b 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1394,10 +1394,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1394 if (rootE.GetAttribute("Engine") != ScriptEngineName) 1394 if (rootE.GetAttribute("Engine") != ScriptEngineName)
1395 return; 1395 return;
1396 1396
1397 if (rootE.GetAttribute("UUID") != itemID.ToString()) 1397// On rez from inventory, that ID will have changed. It was only
1398 return; 1398// advisory anyway. So we don't check it anymore.
1399 1399//
1400// string assetID = rootE.GetAttribute("Asset"); 1400// if (rootE.GetAttribute("UUID") != itemID.ToString())
1401// return;
1401 1402
1402 XmlNodeList stateL = rootE.GetElementsByTagName("ScriptState"); 1403 XmlNodeList stateL = rootE.GetElementsByTagName("ScriptState");
1403 1404