diff options
author | mingchen | 2007-06-12 23:44:02 +0000 |
---|---|---|
committer | mingchen | 2007-06-12 23:44:02 +0000 |
commit | de7dafa3b927128c30224f231161d984481cc68b (patch) | |
tree | 80bfd0557239f513a4eecc8366ee1c9458a8889a | |
parent | * ignored data recieved from closed sockets (diff) | |
download | opensim-SC_OLD-de7dafa3b927128c30224f231161d984481cc68b.zip opensim-SC_OLD-de7dafa3b927128c30224f231161d984481cc68b.tar.gz opensim-SC_OLD-de7dafa3b927128c30224f231161d984481cc68b.tar.bz2 opensim-SC_OLD-de7dafa3b927128c30224f231161d984481cc68b.tar.xz |
*Attempting to get trunk stable before a revert is required.
-rw-r--r-- | OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs b/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs index ace0d20..21b783f 100644 --- a/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs +++ b/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs | |||
@@ -396,7 +396,7 @@ namespace OpenSim.RegionServer.Simulator | |||
396 | packet = new ParcelOverlayPacket(); | 396 | packet = new ParcelOverlayPacket(); |
397 | packet.ParcelData.Data = byteArray; | 397 | packet.ParcelData.Data = byteArray; |
398 | packet.ParcelData.SequenceID = sequenceID; | 398 | packet.ParcelData.SequenceID = sequenceID; |
399 | remote_client.OutPacket((Packet)packet); | 399 | //remote_client.OutPacket((Packet)packet); |
400 | sequenceID++; | 400 | sequenceID++; |
401 | byteArray = new byte[PARCEL_BLOCKS_PER_PACKET]; | 401 | byteArray = new byte[PARCEL_BLOCKS_PER_PACKET]; |
402 | } | 402 | } |
@@ -406,7 +406,7 @@ namespace OpenSim.RegionServer.Simulator | |||
406 | packet = new ParcelOverlayPacket(); | 406 | packet = new ParcelOverlayPacket(); |
407 | packet.ParcelData.Data = byteArray; | 407 | packet.ParcelData.Data = byteArray; |
408 | packet.ParcelData.SequenceID = sequenceID; //Eh? | 408 | packet.ParcelData.SequenceID = sequenceID; //Eh? |
409 | remote_client.OutPacket((Packet)packet); | 409 | //remote_client.OutPacket((Packet)packet); |
410 | } | 410 | } |
411 | #endregion | 411 | #endregion |
412 | 412 | ||
@@ -510,7 +510,7 @@ namespace OpenSim.RegionServer.Simulator | |||
510 | public void sendParcelProperties(int sequence_id, bool snap_selection, int request_result, ClientView remote_client) | 510 | public void sendParcelProperties(int sequence_id, bool snap_selection, int request_result, ClientView remote_client) |
511 | { | 511 | { |
512 | 512 | ||
513 | ParcelPropertiesPacket updatePacket = new ParcelPropertiesPacket(); | 513 | /*ParcelPropertiesPacket updatePacket = new ParcelPropertiesPacket(); |
514 | updatePacket.ParcelData.AABBMax = parcelData.AABBMax; | 514 | updatePacket.ParcelData.AABBMax = parcelData.AABBMax; |
515 | updatePacket.ParcelData.AABBMin = parcelData.AABBMin; | 515 | updatePacket.ParcelData.AABBMin = parcelData.AABBMin; |
516 | updatePacket.ParcelData.Area = parcelData.area; | 516 | updatePacket.ParcelData.Area = parcelData.area; |
@@ -562,7 +562,7 @@ namespace OpenSim.RegionServer.Simulator | |||
562 | updatePacket.ParcelData.TotalPrims = 0; //unemplemented | 562 | updatePacket.ParcelData.TotalPrims = 0; //unemplemented |
563 | updatePacket.ParcelData.UserLocation = parcelData.userLocation; | 563 | updatePacket.ParcelData.UserLocation = parcelData.userLocation; |
564 | updatePacket.ParcelData.UserLookAt = parcelData.userLookAt; | 564 | updatePacket.ParcelData.UserLookAt = parcelData.userLookAt; |
565 | remote_client.OutPacket((Packet)updatePacket); | 565 | remote_client.OutPacket((Packet)updatePacket); */ |
566 | } | 566 | } |
567 | 567 | ||
568 | public void updateParcelProperties(ParcelPropertiesUpdatePacket packet, ClientView remote_client) | 568 | public void updateParcelProperties(ParcelPropertiesUpdatePacket packet, ClientView remote_client) |