aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authormingchen2007-12-21 03:34:51 +0000
committermingchen2007-12-21 03:34:51 +0000
commit169e176f47b66b6c5235f7bcaa9cb15b9117fa2b (patch)
tree12776e5b6ac0735ac5e90f0f0932de4a0bac0ccd /OpenSim/Region
parent* Update to send the parcel gathering error to a .Debug message.. so that a ... (diff)
downloadopensim-SC-169e176f47b66b6c5235f7bcaa9cb15b9117fa2b.zip
opensim-SC-169e176f47b66b6c5235f7bcaa9cb15b9117fa2b.tar.gz
opensim-SC-169e176f47b66b6c5235f7bcaa9cb15b9117fa2b.tar.bz2
opensim-SC-169e176f47b66b6c5235f7bcaa9cb15b9117fa2b.tar.xz
*RemoteAdminPlugin can now be password protected. Add the password in the INI under [RemoteAdmin] with the name access_password
*Removed a few more unneeded exceptions in land that has been fixed
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/LandManagement/Land.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/LandManagement/Land.cs
index 11ff0ee..7977c78 100644
--- a/OpenSim/Region/Environment/LandManagement/Land.cs
+++ b/OpenSim/Region/Environment/LandManagement/Land.cs
@@ -472,7 +472,7 @@ namespace OpenSim.Region.Environment.LandManagement
472 if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2) 472 if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
473 { 473 {
474 //Throw an exception - The bitmap is not 64x64 474 //Throw an exception - The bitmap is not 64x64
475 throw new Exception("Error: Invalid Parcel Bitmap"); 475 //throw new Exception("Error: Invalid Parcel Bitmap");
476 } 476 }
477 else 477 else
478 { 478 {
@@ -584,7 +584,7 @@ namespace OpenSim.Region.Environment.LandManagement
584 if (land_bitmap.GetLength(0) != 64 || land_bitmap.GetLength(1) != 64 || land_bitmap.Rank != 2) 584 if (land_bitmap.GetLength(0) != 64 || land_bitmap.GetLength(1) != 64 || land_bitmap.Rank != 2)
585 { 585 {
586 //Throw an exception - The bitmap is not 64x64 586 //Throw an exception - The bitmap is not 64x64
587 throw new Exception("Error: Invalid Parcel Bitmap in modifyLandBitmapSquare()"); 587 //throw new Exception("Error: Invalid Parcel Bitmap in modifyLandBitmapSquare()");
588 } 588 }
589 589
590 int x, y; 590 int x, y;