diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 026c6c884c..09a3bd604f 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
return false;
}
- public bool CreateObject(GridRegion destination, UUID userID, UUID itemID)
- {
- if (destination == null)
- return false;
-
- if (m_scenes.ContainsKey(destination.RegionID))
- {
-// m_log.DebugFormat(
-// "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
-// s.RegionInfo.RegionName, destination.RegionHandle);
-
- return m_scenes[destination.RegionID].IncomingCreateObject(userID, itemID);
- }
-
- return false;
- }
-
-
#endregion /* IInterregionComms */
#region Misc
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index f980f688cc..bd4a23b873 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
return false;
}
- public bool CreateObject(GridRegion destination, UUID userID, UUID itemID)
- {
- // Not Implemented
- return false;
- }
-
#endregion /* IInterregionComms */
-
}
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0f23cc7f44..293c72a8c9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2501,28 +2501,6 @@ namespace OpenSim.Region.Framework.Scenes
return true;
}
- ///
- /// Attachment rezzing
- ///
- /// Agent Unique ID
- /// Object ID
- /// False
- public virtual bool IncomingCreateObject(UUID userID, UUID itemID)
- {
- m_log.DebugFormat(" >>> IncomingCreateObject(userID, itemID) <<< {0} {1}", userID, itemID);
-
- // Commented out since this is as yet unused and is arguably not the appropriate place to do this, as
- // attachments are being rezzed elsewhere in AddNewClient()
-// ScenePresence sp = GetScenePresence(userID);
-// if (sp != null && AttachmentsModule != null)
-// {
-// uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID);
-// AttachmentsModule.RezSingleAttachmentFromInventory(sp.ControllingClient, itemID, attPt);
-// }
-
- return false;
- }
-
///
/// Adds a Scene Object group to the Scene.
/// Verifies that the creator of the object is not banned from the simulator.
diff --git a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
index a4d03ba891..dbb1a15ae7 100644
--- a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
@@ -93,11 +93,6 @@ namespace OpenSim.Server.Handlers.Simulation
DoObjectPost(request, responsedata, regionID);
return responsedata;
}
- else if (method.Equals("PUT"))
- {
- DoObjectPut(request, responsedata, regionID);
- return responsedata;
- }
//else if (method.Equals("DELETE"))
//{
// DoObjectDelete(request, responsedata, agentID, action, regionHandle);
@@ -219,48 +214,5 @@ namespace OpenSim.Server.Handlers.Simulation
{
return m_SimulationService.CreateObject(destination, newPosition, sog, false);
}
-
- protected virtual void DoObjectPut(Hashtable request, Hashtable responsedata, UUID regionID)
- {
- OSDMap args = Utils.GetOSDMap((string)request["body"]);
- if (args == null)
- {
- responsedata["int_response_code"] = 400;
- responsedata["str_response_string"] = "false";
- return;
- }
-
- // retrieve the input arguments
- int x = 0, y = 0;
- UUID uuid = UUID.Zero;
- string regionname = string.Empty;
- if (args.ContainsKey("destination_x") && args["destination_x"] != null)
- Int32.TryParse(args["destination_x"].AsString(), out x);
- if (args.ContainsKey("destination_y") && args["destination_y"] != null)
- Int32.TryParse(args["destination_y"].AsString(), out y);
- if (args.ContainsKey("destination_uuid") && args["destination_uuid"] != null)
- UUID.TryParse(args["destination_uuid"].AsString(), out uuid);
- if (args.ContainsKey("destination_name") && args["destination_name"] != null)
- regionname = args["destination_name"].ToString();
-
- GridRegion destination = new GridRegion();
- destination.RegionID = uuid;
- destination.RegionLocX = x;
- destination.RegionLocY = y;
- destination.RegionName = regionname;
-
- UUID userID = UUID.Zero, itemID = UUID.Zero;
- if (args.ContainsKey("userid") && args["userid"] != null)
- userID = args["userid"].AsUUID();
- if (args.ContainsKey("itemid") && args["itemid"] != null)
- itemID = args["itemid"].AsUUID();
-
- // This is the meaning of PUT object
- bool result = m_SimulationService.CreateObject(destination, userID, itemID);
-
- responsedata["int_response_code"] = 200;
- responsedata["str_response_string"] = result.ToString();
- }
-
}
}
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index 4e52532415..b10a85c24e 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -110,16 +110,6 @@ namespace OpenSim.Services.Interfaces
///
bool CreateObject(GridRegion destination, Vector3 newPosition, ISceneObject sog, bool isLocalCall);
- ///
- /// Create an object from the user's inventory in the destination region.
- /// This message is used primarily by clients.
- ///
- ///
- ///
- ///
- ///
- bool CreateObject(GridRegion destination, UUID userID, UUID itemID);
-
#endregion Objects
}