OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

*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
afrisby
mingchen 2007-07-12 16:19:32 +00:00
parent 7198d7980d
commit b27924d0a5
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Environment/EstateManager.cs
View File

@ -71,7 +71,6 @@ namespace OpenSim.Region.Environment
switch (Helpers.FieldToUTF8String(packet.MethodData.Method)) switch (Helpers.FieldToUTF8String(packet.MethodData.Method))
{ {
case "getinfo": case "getinfo":
Console.WriteLine("GETINFO Requested");
this.sendRegionInfoPacketToAll(); this.sendRegionInfoPacketToAll();
break; break;

10
OpenSim/Region/Environment/ParcelManager.cs
View File

@ -356,11 +356,11 @@ namespace OpenSim.Region.Environment
//Sale Flag //Sale Flag
tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_IS_FOR_SALE); 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 //Public Flag
tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_PUBLIC); tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_PUBLIC);
} }*/
else else
{ {
//Other Flag //Other Flag
@ -395,6 +395,7 @@ namespace OpenSim.Region.Environment
packet = new ParcelOverlayPacket(); packet = new ParcelOverlayPacket();
packet.ParcelData.Data = byteArray; packet.ParcelData.Data = byteArray;
packet.ParcelData.SequenceID = sequenceID; packet.ParcelData.SequenceID = sequenceID;
Console.WriteLine("SENT #" + sequenceID);
remote_client.OutPacket((Packet)packet); remote_client.OutPacket((Packet)packet);
sequenceID++; sequenceID++;
byteArray = new byte[PARCEL_BLOCKS_PER_PACKET]; 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) public void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client)

16
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -487,15 +487,17 @@ namespace OpenSim.Region.Environment.Scenes
client.OnLinkObjects += this.LinkObjects; client.OnLinkObjects += this.LinkObjects;
client.OnObjectDuplicate += this.DuplicateObject; client.OnObjectDuplicate += this.DuplicateObject;
/* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); client.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
remoteClient.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest); client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);
remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
*/
this.estateManager.sendRegionHandshake(client);
this.estateManager.sendRegionHandshake(client);
CreateAndAddScenePresence(client); CreateAndAddScenePresence(client);
this.parcelManager.sendParcelOverlay(client);
return; return;
} }

1
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -274,6 +274,7 @@ namespace OpenSim.Region.Environment.Scenes
{ {
movementflag -= (byte)(uint)DCF; movementflag -= (byte)(uint)DCF;
update_movementflag = true; update_movementflag = true;
} }
} }
i++; i++;