aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs
diff options
context:
space:
mode:
authormingchen2007-06-07 16:29:10 +0000
committermingchen2007-06-07 16:29:10 +0000
commit458c6b6f1687a63c7b443a8e76ee31da75c99247 (patch)
treea96d8c96f7da66344f83fbdc2c15c3e421230e34 /OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs
parentFixed SVN: All Done! Sorry for the delay (3 / 3) (diff)
downloadopensim-SC_OLD-458c6b6f1687a63c7b443a8e76ee31da75c99247.zip
opensim-SC_OLD-458c6b6f1687a63c7b443a8e76ee31da75c99247.tar.gz
opensim-SC_OLD-458c6b6f1687a63c7b443a8e76ee31da75c99247.tar.bz2
opensim-SC_OLD-458c6b6f1687a63c7b443a8e76ee31da75c99247.tar.xz
*Added EstateSettings.cs and moved many relevant variables from RegionInfoBase to EstateSettings class and added an EstateSettings objection to RegionInfoBase
*Added a few missed copyright headers *Fixed a filename typo
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs')
-rw-r--r--OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs3
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs b/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs
index a9d4eea..6d432f1 100644
--- a/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs
+++ b/OpenSim/OpenSim.RegionServer/Simulator/ParcelManager.cs
@@ -284,7 +284,6 @@ namespace OpenSim.RegionServer.Simulator
284 { 284 {
285 end_x -= 4; 285 end_x -= 4;
286 end_y -= 4; 286 end_y -= 4;
287 Console.WriteLine("Joining Parcels between (" + start_x + ", " + start_y + ") and (" + end_x + ", " + end_y + ")");
288 287
289 //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box! 288 //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box!
290 //This should be fixed later -- somewhat "incomplete code" --Ming 289 //This should be fixed later -- somewhat "incomplete code" --Ming
@@ -315,7 +314,6 @@ namespace OpenSim.RegionServer.Simulator
315 return false; 314 return false;
316 } 315 }
317 316
318 Console.WriteLine("Performing Join on parcel: " + startParcel.parcelData.parcelName + " - " + startParcel.parcelData.area + "sqm and " + endParcel.parcelData.parcelName + " - " + endParcel.parcelData.area + "sqm");
319 //Same owners! Lets join them 317 //Same owners! Lets join them
320 //Merge them to startParcel 318 //Merge them to startParcel
321 parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap())); 319 parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap()));
@@ -573,7 +571,6 @@ namespace OpenSim.RegionServer.Simulator
573 if (remote_client.AgentID == parcelData.ownerID) 571 if (remote_client.AgentID == parcelData.ownerID)
574 { 572 {
575 //Needs later group support 573 //Needs later group support
576 Console.WriteLine("Request for update - parcel #" + parcelData.localID);
577 parcelData.authBuyerID = packet.ParcelData.AuthBuyerID; 574 parcelData.authBuyerID = packet.ParcelData.AuthBuyerID;
578 parcelData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category; 575 parcelData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category;
579 parcelData.parcelDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc); 576 parcelData.parcelDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);