diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 4a4b7a0..417f817 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -417,22 +417,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
417 | /// | 417 | /// |
418 | /// </summary> | 418 | /// </summary> |
419 | /// <param name="addPacket"></param> | 419 | /// <param name="addPacket"></param> |
420 | /// <param name="agentClient"></param> | ||
421 | public void AddNewPrim(Packet addPacket, IClientAPI agentClient) | ||
422 | { | ||
423 | AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentId); | ||
424 | } | ||
425 | |||
426 | /// <summary> | ||
427 | /// | ||
428 | /// </summary> | ||
429 | /// <param name="addPacket"></param> | ||
430 | /// <param name="ownerID"></param> | 420 | /// <param name="ownerID"></param> |
431 | public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID) | 421 | public void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape) |
432 | { | 422 | { |
433 | try | 423 | try |
434 | { | 424 | { |
435 | SceneObject sceneOb = new SceneObject(m_regionHandle, this, addPacket, ownerID, this.PrimIDAllocate()); | 425 | SceneObject sceneOb = new SceneObject(m_regionHandle, this, ownerID, this.PrimIDAllocate(), pos, shape); |
436 | this.Entities.Add(sceneOb.rootUUID, sceneOb); | 426 | this.Entities.Add(sceneOb.rootUUID, sceneOb); |
437 | 427 | ||
438 | // Trigger event for listeners | 428 | // Trigger event for listeners |
@@ -444,13 +434,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
444 | } | 434 | } |
445 | } | 435 | } |
446 | 436 | ||
447 | public override uint AddNewPrim(LLUUID ownerId, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID texture, int flags) | ||
448 | { | ||
449 | uint id = NextLocalId; | ||
450 | |||
451 | throw new NotImplementedException("Not implemented yet."); | ||
452 | } | ||
453 | |||
454 | #endregion | 437 | #endregion |
455 | 438 | ||
456 | #region Add/Remove Avatar Methods | 439 | #region Add/Remove Avatar Methods |