aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2009-11-26 12:16:42 +0000
committerMelanie2009-11-26 13:13:56 +0000
commita27d33cb634c78425eaa34cb5efd113e131baa51 (patch)
tree5c8d279f123158ba6cf3e26280f7bd4111250200 /OpenSim/Region/Framework/Scenes/Scene.cs
parentRemove GetAssemblyName and friends from the SE interface. It's now handled (diff)
downloadopensim-SC-a27d33cb634c78425eaa34cb5efd113e131baa51.zip
opensim-SC-a27d33cb634c78425eaa34cb5efd113e131baa51.tar.gz
opensim-SC-a27d33cb634c78425eaa34cb5efd113e131baa51.tar.bz2
opensim-SC-a27d33cb634c78425eaa34cb5efd113e131baa51.tar.xz
Remove the old remoting-type interregion code for prim/script crossing
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs99
1 files changed, 0 insertions, 99 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index be1d4bf..f932659 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2393,103 +2393,6 @@ namespace OpenSim.Region.Framework.Scenes
2393 return successYN; 2393 return successYN;
2394 } 2394 }
2395 2395
2396 /// <summary>
2397 /// Handle a scene object that is crossing into this region from another.
2398 /// NOTE: Unused as of 2009-02-09. Soon to be deleted.
2399 /// </summary>
2400 /// <param name="regionHandle"></param>
2401 /// <param name="primID"></param>
2402 /// <param name="objXMLData"></param>
2403 /// <param name="XMLMethod"></param>
2404 /// <returns></returns>
2405 public bool IncomingInterRegionPrimGroup(UUID primID, string objXMLData, int XMLMethod)
2406 {
2407 if (XMLMethod == 0)
2408 {
2409 m_log.DebugFormat("[INTERREGION]: A new prim {0} arrived from a neighbor", primID);
2410 SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData);
2411 if (sceneObject.IsAttachment)
2412 sceneObject.RootPart.ObjectFlags |= (uint)PrimFlags.Phantom;
2413
2414 return AddSceneObject(sceneObject);
2415 }
2416 else if ((XMLMethod == 100) && m_allowScriptCrossings)
2417 {
2418 m_log.Warn("[INTERREGION]: Prim state data arrived from a neighbor");
2419
2420 XmlDocument doc = new XmlDocument();
2421 doc.LoadXml(objXMLData);
2422
2423 XmlNodeList rootL = doc.GetElementsByTagName("ScriptData");
2424 if (rootL.Count == 1)
2425 {
2426 XmlNode rootNode = rootL[0];
2427 if (rootNode != null)
2428 {
2429 XmlNodeList partL = rootNode.ChildNodes;
2430
2431 foreach (XmlNode part in partL)
2432 {
2433 XmlNodeList nodeL = part.ChildNodes;
2434
2435 switch (part.Name)
2436 {
2437 case "Assemblies":
2438 foreach (XmlNode asm in nodeL)
2439 {
2440 string fn = asm.Attributes.GetNamedItem("Filename").Value;
2441
2442 Byte[] filedata = Convert.FromBase64String(asm.InnerText);
2443 string path = Path.Combine("ScriptEngines", RegionInfo.RegionID.ToString());
2444 path = Path.Combine(path, fn);
2445
2446 if (!File.Exists(path))
2447 {
2448 FileStream fs = File.Create(path);
2449 fs.Write(filedata, 0, filedata.Length);
2450 fs.Close();
2451 }
2452 }
2453 break;
2454 case "ScriptStates":
2455 foreach (XmlNode st in nodeL)
2456 {
2457 string id = st.Attributes.GetNamedItem("UUID").Value;
2458 UUID uuid = new UUID(id);
2459 XmlNode state = st.ChildNodes[0];
2460
2461 XmlDocument sdoc = new XmlDocument();
2462 XmlNode sxmlnode = sdoc.CreateNode(
2463 XmlNodeType.XmlDeclaration,
2464 "", "");
2465 sdoc.AppendChild(sxmlnode);
2466
2467 XmlNode newnode = sdoc.ImportNode(state, true);
2468 sdoc.AppendChild(newnode);
2469
2470 string spath = Path.Combine("ScriptEngines", RegionInfo.RegionID.ToString());
2471 spath = Path.Combine(spath, uuid.ToString());
2472 FileStream sfs = File.Create(spath + ".state");
2473 ASCIIEncoding enc = new ASCIIEncoding();
2474 Byte[] buf = enc.GetBytes(sdoc.InnerXml);
2475 sfs.Write(buf, 0, buf.Length);
2476 sfs.Close();
2477 }
2478 break;
2479 }
2480 }
2481 }
2482 }
2483
2484 SceneObjectPart RootPrim = GetSceneObjectPart(primID);
2485 RootPrim.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, 1);
2486
2487 return true;
2488 }
2489
2490 return true;
2491 }
2492
2493 public bool IncomingCreateObject(ISceneObject sog) 2396 public bool IncomingCreateObject(ISceneObject sog)
2494 { 2397 {
2495 //m_log.Debug(" >>> IncomingCreateObject <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted); 2398 //m_log.Debug(" >>> IncomingCreateObject <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted);
@@ -3362,7 +3265,6 @@ namespace OpenSim.Region.Framework.Scenes
3362 m_sceneGridService.OnCloseAgentConnection += IncomingCloseAgent; 3265 m_sceneGridService.OnCloseAgentConnection += IncomingCloseAgent;
3363 //m_eventManager.OnRegionUp += OtherRegionUp; 3266 //m_eventManager.OnRegionUp += OtherRegionUp;
3364 //m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate; 3267 //m_sceneGridService.OnChildAgentUpdate += IncomingChildAgentDataUpdate;
3365 m_sceneGridService.OnExpectPrim += IncomingInterRegionPrimGroup;
3366 //m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar; 3268 //m_sceneGridService.OnRemoveKnownRegionFromAvatar += HandleRemoveKnownRegionsFromAvatar;
3367 m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid; 3269 m_sceneGridService.OnLogOffUser += HandleLogOffUserFromGrid;
3368 m_sceneGridService.KiPrimitive += SendKillObject; 3270 m_sceneGridService.KiPrimitive += SendKillObject;
@@ -3386,7 +3288,6 @@ namespace OpenSim.Region.Framework.Scenes
3386 m_sceneGridService.KiPrimitive -= SendKillObject; 3288 m_sceneGridService.KiPrimitive -= SendKillObject;
3387 m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid; 3289 m_sceneGridService.OnLogOffUser -= HandleLogOffUserFromGrid;
3388 //m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar; 3290 //m_sceneGridService.OnRemoveKnownRegionFromAvatar -= HandleRemoveKnownRegionsFromAvatar;
3389 m_sceneGridService.OnExpectPrim -= IncomingInterRegionPrimGroup;
3390 //m_sceneGridService.OnChildAgentUpdate -= IncomingChildAgentDataUpdate; 3291 //m_sceneGridService.OnChildAgentUpdate -= IncomingChildAgentDataUpdate;
3391 //m_eventManager.OnRegionUp -= OtherRegionUp; 3292 //m_eventManager.OnRegionUp -= OtherRegionUp;
3392 m_sceneGridService.OnExpectUser -= HandleNewUserConnection; 3293 m_sceneGridService.OnExpectUser -= HandleNewUserConnection;