*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

4 files changed, 14 insertions, 14 deletions

diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index b5a74ad..de0b040 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -71,7 +71,6 @@ namespace OpenSim.Region.Environment
                 switch (Helpers.FieldToUTF8String(packet.MethodData.Method))

                 {

                     case "getinfo":

-                        Console.WriteLine("GETINFO Requested");

                         this.sendRegionInfoPacketToAll();

 

                         break;

diff --git a/OpenSim/Region/Environment/ParcelManager.cs b/OpenSim/Region/Environment/ParcelManager.cs
index 2059b3f..a1ed930 100644
--- a/OpenSim/Region/Environment/ParcelManager.cs
+++ b/OpenSim/Region/Environment/ParcelManager.cs
@@ -356,11 +356,11 @@ namespace OpenSim.Region.Environment
                         //Sale Flag

                         tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_IS_FOR_SALE);

                     }

-                    else if (currentParcelBlock.parcelData.ownerID == LLUUID.Zero)

+                    /*else if (currentParcelBlock.parcelData.ownerID == LLUUID.Zero)

                     {

                         //Public Flag

                         tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_PUBLIC);

-                    }

+                    }*/

                     else

                     {

                         //Other Flag

@@ -395,6 +395,7 @@ namespace OpenSim.Region.Environment
                         packet = new ParcelOverlayPacket();

                         packet.ParcelData.Data = byteArray;

                         packet.ParcelData.SequenceID = sequenceID;

+                        Console.WriteLine("SENT #" + sequenceID);

                         remote_client.OutPacket((Packet)packet);

                         sequenceID++;

                         byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];

@@ -402,10 +403,7 @@ namespace OpenSim.Region.Environment
                 }

             }

 

-            packet = new ParcelOverlayPacket();

-            packet.ParcelData.Data = byteArray;

-            packet.ParcelData.SequenceID = sequenceID; //Eh?

-            remote_client.OutPacket((Packet)packet);

+            

         }

 

         public void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client)

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;

         }

 

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
                     {

                         movementflag -= (byte)(uint)DCF;

                         update_movementflag = true;

+                      

                     }

                 }

                 i++;