diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 1 |
2 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 80c61e1..d526b3c 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -487,15 +487,17 @@ namespace OpenSim.Region.Environment.Scenes | |||
487 | client.OnLinkObjects += this.LinkObjects; | 487 | client.OnLinkObjects += this.LinkObjects; |
488 | client.OnObjectDuplicate += this.DuplicateObject; | 488 | client.OnObjectDuplicate += this.DuplicateObject; |
489 | 489 | ||
490 | /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); | 490 | client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); |
491 | remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); | 491 | client.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); |
492 | remoteClient.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest); | 492 | client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest); |
493 | remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); | 493 | client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); |
494 | remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); | 494 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); |
495 | */ | 495 | |
496 | this.estateManager.sendRegionHandshake(client); | 496 | this.estateManager.sendRegionHandshake(client); |
497 | |||
498 | CreateAndAddScenePresence(client); | 497 | CreateAndAddScenePresence(client); |
498 | |||
499 | this.parcelManager.sendParcelOverlay(client); | ||
500 | |||
499 | return; | 501 | return; |
500 | } | 502 | } |
501 | 503 | ||
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index e65ab7c..8134276 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -274,6 +274,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
274 | { | 274 | { |
275 | movementflag -= (byte)(uint)DCF; | 275 | movementflag -= (byte)(uint)DCF; |
276 | update_movementflag = true; | 276 | update_movementflag = true; |
277 | |||
277 | } | 278 | } |
278 | } | 279 | } |
279 | i++; | 280 | i++; |