aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-30 01:14:49 +0100
committerJustin Clark-Casey (justincc)2012-06-30 01:14:49 +0100
commita4551b027bc3f9dfcf79f74210a1156abfb7bb2f (patch)
treee07fea6ca3111135806559594ffc1c87209c1d7e
parentRemove code listed for removal in 0.7.3 that handled script restart for incom... (diff)
downloadopensim-SC-a4551b027bc3f9dfcf79f74210a1156abfb7bb2f.zip
opensim-SC-a4551b027bc3f9dfcf79f74210a1156abfb7bb2f.tar.gz
opensim-SC-a4551b027bc3f9dfcf79f74210a1156abfb7bb2f.tar.bz2
opensim-SC-a4551b027bc3f9dfcf79f74210a1156abfb7bb2f.tar.xz
Removing unused handling of incoming create object by userID and itemID only.
It appears this was never actually used since attachments were rezzed in other code. This was never available on remote simulator comms, only local.
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs18
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs9
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs22
-rw-r--r--OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs48
-rw-r--r--OpenSim/Services/Interfaces/ISimulationService.cs10
5 files changed, 1 insertions, 106 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
diff --git a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
index a4d03ba..dbb1a15 100644
--- a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
@@ -93,11 +93,6 @@ namespace OpenSim.Server.Handlers.Simulation
93 DoObjectPost(request, responsedata, regionID); 93 DoObjectPost(request, responsedata, regionID);
94 return responsedata; 94 return responsedata;
95 } 95 }
96 else if (method.Equals("PUT"))
97 {
98 DoObjectPut(request, responsedata, regionID);
99 return responsedata;
100 }
101 //else if (method.Equals("DELETE")) 96 //else if (method.Equals("DELETE"))
102 //{ 97 //{
103 // DoObjectDelete(request, responsedata, agentID, action, regionHandle); 98 // DoObjectDelete(request, responsedata, agentID, action, regionHandle);
@@ -219,48 +214,5 @@ namespace OpenSim.Server.Handlers.Simulation
219 { 214 {
220 return m_SimulationService.CreateObject(destination, newPosition, sog, false); 215 return m_SimulationService.CreateObject(destination, newPosition, sog, false);
221 } 216 }
222
223 protected virtual void DoObjectPut(Hashtable request, Hashtable responsedata, UUID regionID)
224 {
225 OSDMap args = Utils.GetOSDMap((string)request["body"]);
226 if (args == null)
227 {
228 responsedata["int_response_code"] = 400;
229 responsedata["str_response_string"] = "false";
230 return;
231 }
232
233 // retrieve the input arguments
234 int x = 0, y = 0;
235 UUID uuid = UUID.Zero;
236 string regionname = string.Empty;
237 if (args.ContainsKey("destination_x") && args["destination_x"] != null)
238 Int32.TryParse(args["destination_x"].AsString(), out x);
239 if (args.ContainsKey("destination_y") && args["destination_y"] != null)
240 Int32.TryParse(args["destination_y"].AsString(), out y);
241 if (args.ContainsKey("destination_uuid") && args["destination_uuid"] != null)
242 UUID.TryParse(args["destination_uuid"].AsString(), out uuid);
243 if (args.ContainsKey("destination_name") && args["destination_name"] != null)
244 regionname = args["destination_name"].ToString();
245
246 GridRegion destination = new GridRegion();
247 destination.RegionID = uuid;
248 destination.RegionLocX = x;
249 destination.RegionLocY = y;
250 destination.RegionName = regionname;
251
252 UUID userID = UUID.Zero, itemID = UUID.Zero;
253 if (args.ContainsKey("userid") && args["userid"] != null)
254 userID = args["userid"].AsUUID();
255 if (args.ContainsKey("itemid") && args["itemid"] != null)
256 itemID = args["itemid"].AsUUID();
257
258 // This is the meaning of PUT object
259 bool result = m_SimulationService.CreateObject(destination, userID, itemID);
260
261 responsedata["int_response_code"] = 200;
262 responsedata["str_response_string"] = result.ToString();
263 }
264
265 } 217 }
266} 218}
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index 4e52532..b10a85c 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -110,16 +110,6 @@ namespace OpenSim.Services.Interfaces
110 /// <returns></returns> 110 /// <returns></returns>
111 bool CreateObject(GridRegion destination, Vector3 newPosition, ISceneObject sog, bool isLocalCall); 111 bool CreateObject(GridRegion destination, Vector3 newPosition, ISceneObject sog, bool isLocalCall);
112 112
113 /// <summary>
114 /// Create an object from the user's inventory in the destination region.
115 /// This message is used primarily by clients.
116 /// </summary>
117 /// <param name="regionHandle"></param>
118 /// <param name="userID"></param>
119 /// <param name="itemID"></param>
120 /// <returns></returns>
121 bool CreateObject(GridRegion destination, UUID userID, UUID itemID);
122
123 #endregion Objects 113 #endregion Objects
124 114
125 } 115 }