aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs55
2 files changed, 49 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index eb284c1..f79eb5d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1314,7 +1314,7 @@ namespace OpenSim.Region.Framework.Scenes
1314 maintc = Util.EnvironmentTickCountSubtract(maintc); 1314 maintc = Util.EnvironmentTickCountSubtract(maintc);
1315 maintc = (int)(m_timespan * 1000) - maintc; 1315 maintc = (int)(m_timespan * 1000) - maintc;
1316 1316
1317 if ((maintc < (m_timespan * 1000)) && maintc > 0) 1317 if (maintc > 0)
1318 Thread.Sleep(maintc); 1318 Thread.Sleep(maintc);
1319 1319
1320 // Tell the watchdog that this thread is still alive 1320 // Tell the watchdog that this thread is still alive
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 22eedba..47e4ad0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Xml;
29using System.IO; 30using System.IO;
30using System.Collections.Generic; 31using System.Collections.Generic;
31using System.Reflection; 32using System.Reflection;
@@ -283,15 +284,55 @@ namespace OpenSim.Region.Framework.Scenes
283 284
284 private void RestoreSavedScriptState(UUID oldID, UUID newID) 285 private void RestoreSavedScriptState(UUID oldID, UUID newID)
285 { 286 {
287 IScriptModule[] engines = m_part.ParentGroup.Scene.RequestModuleInterfaces<IScriptModule>();
288 if (engines == null) // No engine at all
289 return;
290
286 if (m_part.ParentGroup.m_savedScriptState.ContainsKey(oldID)) 291 if (m_part.ParentGroup.m_savedScriptState.ContainsKey(oldID))
287 { 292 {
288 string fpath = Path.Combine("ScriptEngines/"+m_part.ParentGroup.Scene.RegionInfo.RegionID.ToString(), 293 XmlDocument doc = new XmlDocument();
289 newID.ToString()+".state"); 294
290 FileStream fs = File.Create(fpath); 295 doc.LoadXml(m_part.ParentGroup.m_savedScriptState[oldID]);
291 Byte[] buffer = enc.GetBytes(m_part.ParentGroup.m_savedScriptState[oldID]); 296
292 fs.Write(buffer,0,buffer.Length); 297 ////////// CRUFT WARNING ///////////////////////////////////
293 fs.Close(); 298 //
294 m_part.ParentGroup.m_savedScriptState.Remove(oldID); 299 // Old objects will have <ScriptState><State> ...
300 // This format is XEngine ONLY
301 //
302 // New objects have <State Engine="...." ...><ScriptState>...
303 // This can be passed to any engine
304 //
305 XmlNode n = doc.SelectSingleNode("ScriptState");
306 if (n != null) // Old format data
307 {
308 XmlDocument newDoc = new XmlDocument();
309
310 XmlElement rootN = newDoc.CreateElement("", "State", "");
311 XmlAttribute uuidA = newDoc.CreateAttribute("", "UUID", "");
312 uuidA.Value = oldID.ToString();
313 rootN.Attributes.Append(uuidA);
314 XmlAttribute engineA = newDoc.CreateAttribute("", "Engine", "");
315 engineA.Value = "XEngine";
316 rootN.Attributes.Append(engineA);
317
318 newDoc.AppendChild(rootN);
319
320 XmlNode stateN = newDoc.ImportNode(n, true);
321 rootN.AppendChild(stateN);
322
323 // This created document has only the minimun data
324 // necessary for XEngine to parse it successfully
325
326 m_part.ParentGroup.m_savedScriptState[oldID] = newDoc.OuterXml;
327 }
328 foreach (IScriptModule e in engines)
329 {
330 if (e != null)
331 {
332 if (e.SetXMLState(newID, m_part.ParentGroup.m_savedScriptState[oldID]))
333 break;
334 }
335 }
295 } 336 }
296 } 337 }
297 338