diff options
Diffstat (limited to '')
3 files changed, 1 insertions, 48 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index 026c6c8..09a3bd6 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
@@ -354,24 +354,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
354 | return false; | 354 | return false; |
355 | } | 355 | } |
356 | 356 | ||
357 | public bool CreateObject(GridRegion destination, UUID userID, UUID itemID) | ||
358 | { | ||
359 | if (destination == null) | ||
360 | return false; | ||
361 | |||
362 | if (m_scenes.ContainsKey(destination.RegionID)) | ||
363 | { | ||
364 | // m_log.DebugFormat( | ||
365 | // "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate", | ||
366 | // s.RegionInfo.RegionName, destination.RegionHandle); | ||
367 | |||
368 | return m_scenes[destination.RegionID].IncomingCreateObject(userID, itemID); | ||
369 | } | ||
370 | |||
371 | return false; | ||
372 | } | ||
373 | |||
374 | |||
375 | #endregion /* IInterregionComms */ | 357 | #endregion /* IInterregionComms */ |
376 | 358 | ||
377 | #region Misc | 359 | #region Misc |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index f980f68..bd4a23b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
@@ -300,13 +300,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
300 | return false; | 300 | return false; |
301 | } | 301 | } |
302 | 302 | ||
303 | public bool CreateObject(GridRegion destination, UUID userID, UUID itemID) | ||
304 | { | ||
305 | // Not Implemented | ||
306 | return false; | ||
307 | } | ||
308 | |||
309 | #endregion /* IInterregionComms */ | 303 | #endregion /* IInterregionComms */ |
310 | |||
311 | } | 304 | } |
312 | } | 305 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0f23cc7..293c72a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2502,28 +2502,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2502 | } | 2502 | } |
2503 | 2503 | ||
2504 | /// <summary> | 2504 | /// <summary> |
2505 | /// Attachment rezzing | ||
2506 | /// </summary> | ||
2507 | /// <param name="userID">Agent Unique ID</param> | ||
2508 | /// <param name="itemID">Object ID</param> | ||
2509 | /// <returns>False</returns> | ||
2510 | public virtual bool IncomingCreateObject(UUID userID, UUID itemID) | ||
2511 | { | ||
2512 | m_log.DebugFormat(" >>> IncomingCreateObject(userID, itemID) <<< {0} {1}", userID, itemID); | ||
2513 | |||
2514 | // Commented out since this is as yet unused and is arguably not the appropriate place to do this, as | ||
2515 | // attachments are being rezzed elsewhere in AddNewClient() | ||
2516 | // ScenePresence sp = GetScenePresence(userID); | ||
2517 | // if (sp != null && AttachmentsModule != null) | ||
2518 | // { | ||
2519 | // uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID); | ||
2520 | // AttachmentsModule.RezSingleAttachmentFromInventory(sp.ControllingClient, itemID, attPt); | ||
2521 | // } | ||
2522 | |||
2523 | return false; | ||
2524 | } | ||
2525 | |||
2526 | /// <summary> | ||
2527 | /// Adds a Scene Object group to the Scene. | 2505 | /// Adds a Scene Object group to the Scene. |
2528 | /// Verifies that the creator of the object is not banned from the simulator. | 2506 | /// Verifies that the creator of the object is not banned from the simulator. |
2529 | /// Checks if the item is an Attachment | 2507 | /// Checks if the item is an Attachment |