*Found and fixed bug that crashed viewer when logging in or viewing land owners

*Reenabled estate manager; remember, the master avatar is the only one that can use this (by default: Test User with password 'test')
*Still working on readding support for updating parcel information when logging in or moving into a new parcel

1 files changed, 9 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
             client.OnLinkObjects += this.LinkObjects;

             client.OnObjectDuplicate += this.DuplicateObject;

 

-            /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);

-            remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);

-            remoteClient.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);

-            remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);

-            remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);

-            */

+            client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);

+            client.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);

+            client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);

+            client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);

+            client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);

+            

             this.estateManager.sendRegionHandshake(client);

-

             CreateAndAddScenePresence(client);

+

+            this.parcelManager.sendParcelOverlay(client);

+            

             return;

         }