diff options
author | MW | 2007-06-10 15:43:04 +0000 |
---|---|---|
committer | MW | 2007-06-10 15:43:04 +0000 |
commit | 488e71620866c0749a0347d878f0707de2b8eb15 (patch) | |
tree | d720273e85e489701d4925fe6e845b964b2e0343 /OpenSim/OpenSim.Region/World/World.cs | |
parent | Another bug fix (diff) | |
download | opensim-SC-488e71620866c0749a0347d878f0707de2b8eb15.zip opensim-SC-488e71620866c0749a0347d878f0707de2b8eb15.tar.gz opensim-SC-488e71620866c0749a0347d878f0707de2b8eb15.tar.bz2 opensim-SC-488e71620866c0749a0347d878f0707de2b8eb15.tar.xz |
Prim creation working.
Diffstat (limited to 'OpenSim/OpenSim.Region/World/World.cs')
-rw-r--r-- | OpenSim/OpenSim.Region/World/World.cs | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/OpenSim/OpenSim.Region/World/World.cs b/OpenSim/OpenSim.Region/World/World.cs index c5c554d..49ba8fa 100644 --- a/OpenSim/OpenSim.Region/World/World.cs +++ b/OpenSim/OpenSim.Region/World/World.cs | |||
@@ -450,7 +450,19 @@ namespace OpenSim.Region | |||
450 | /// <param name="ownerID"></param> | 450 | /// <param name="ownerID"></param> |
451 | public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID) | 451 | public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID) |
452 | { | 452 | { |
453 | 453 | try | |
454 | { | ||
455 | // MainConsole.Instance.Notice("World.cs: AddNewPrim() - Creating new prim"); | ||
456 | Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this); | ||
457 | prim.CreateFromPacket(addPacket, ownerID, this._primCount); | ||
458 | |||
459 | this.Entities.Add(prim.uuid, prim); | ||
460 | this._primCount++; | ||
461 | } | ||
462 | catch (Exception e) | ||
463 | { | ||
464 | // MainConsole.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString()); | ||
465 | } | ||
454 | } | 466 | } |
455 | 467 | ||
456 | #endregion | 468 | #endregion |
@@ -469,6 +481,15 @@ namespace OpenSim.Region | |||
469 | //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims); | 481 | //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims); |
470 | remoteClient.OnChatFromViewer += new ChatFromViewer(this.SimChat); | 482 | remoteClient.OnChatFromViewer += new ChatFromViewer(this.SimChat); |
471 | remoteClient.OnRequestWearables += new GenericCall(this.InformClientOfNeighbours); | 483 | remoteClient.OnRequestWearables += new GenericCall(this.InformClientOfNeighbours); |
484 | remoteClient.OnAddPrim += new GenericCall4(this.AddNewPrim); | ||
485 | |||
486 | /* | ||
487 | remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); | ||
488 | remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); | ||
489 | remoteClient.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest); | ||
490 | remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); | ||
491 | remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); | ||
492 | */ | ||
472 | 493 | ||
473 | Avatar newAvatar = null; | 494 | Avatar newAvatar = null; |
474 | try | 495 | try |