aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/LandManagement/LandManager.cs
diff options
context:
space:
mode:
authorJeff Ames2008-02-05 19:44:27 +0000
committerJeff Ames2008-02-05 19:44:27 +0000
commit6ed5283bc06a62f38eb517e67b975832b603bf61 (patch)
treee5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Region/Environment/LandManagement/LandManager.cs
parentCut down on the number of packets sent during terraforming. Terraforming shou... (diff)
downloadopensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.zip
opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz
opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2
opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.xz
Converted logging to use log4net.
Changed LogBase to ConsoleBase, which handles console I/O. This is mostly an in-place conversion, so lots of refactoring can still be done.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/LandManagement/LandManager.cs11
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs
index c0c1b73..09fa09b 100644
--- a/OpenSim/Region/Environment/LandManagement/LandManager.cs
+++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs
@@ -25,6 +25,7 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28
28using System; 29using System;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using Axiom.Math; 31using Axiom.Math;
@@ -38,7 +39,6 @@ using OpenSim.Region.Physics.Manager;
38 39
39namespace OpenSim.Region.Environment.LandManagement 40namespace OpenSim.Region.Environment.LandManagement
40{ 41{
41
42 #region LandManager Class 42 #region LandManager Class
43 43
44 /// <summary> 44 /// <summary>
@@ -46,6 +46,8 @@ namespace OpenSim.Region.Environment.LandManagement
46 /// </summary> 46 /// </summary>
47 public class LandManager 47 public class LandManager
48 { 48 {
49 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
50
49 #region Constants 51 #region Constants
50 52
51 //Land types set with flags in ParcelOverlay. 53 //Land types set with flags in ParcelOverlay.
@@ -57,7 +59,6 @@ namespace OpenSim.Region.Environment.LandManagement
57 public const byte LAND_TYPE_IS_FOR_SALE = (byte) 4; //Equals 00000100 59 public const byte LAND_TYPE_IS_FOR_SALE = (byte) 4; //Equals 00000100
58 public const byte LAND_TYPE_IS_BEING_AUCTIONED = (byte) 5; //Equals 00000101 60 public const byte LAND_TYPE_IS_BEING_AUCTIONED = (byte) 5; //Equals 00000101
59 61
60
61 //Flags that when set, a border on the given side will be placed 62 //Flags that when set, a border on the given side will be placed
62 //NOTE: North and East is assumable by the west and south sides (if land to east has a west border, then I have an east border; etc) 63 //NOTE: North and East is assumable by the west and south sides (if land to east has a west border, then I have an east border; etc)
63 //This took forever to figure out -- jeesh. /blame LL for even having to send these 64 //This took forever to figure out -- jeesh. /blame LL for even having to send these
@@ -73,7 +74,6 @@ namespace OpenSim.Region.Environment.LandManagement
73 public const int LAND_SELECT_OBJECTS_GROUP = 4; 74 public const int LAND_SELECT_OBJECTS_GROUP = 4;
74 public const int LAND_SELECT_OBJECTS_OTHER = 8; 75 public const int LAND_SELECT_OBJECTS_OTHER = 8;
75 76
76
77 //These are other constants. Yay! 77 //These are other constants. Yay!
78 public const int START_LAND_LOCAL_ID = 1; 78 public const int START_LAND_LOCAL_ID = 1;
79 79
@@ -127,7 +127,7 @@ namespace OpenSim.Region.Environment.LandManagement
127 //} 127 //}
128 //catch (Exception ex) 128 //catch (Exception ex)
129 //{ 129 //{
130 //MainLog.Instance.Error("LandManager", "IncomingLandObjectsFromStorage: Exception: " + ex.ToString()); 130 //m_log.Error("[LandManager]: IncomingLandObjectsFromStorage: Exception: " + ex.ToString());
131 //throw ex; 131 //throw ex;
132 //} 132 //}
133 } 133 }
@@ -526,8 +526,7 @@ namespace OpenSim.Region.Environment.LandManagement
526 } 526 }
527 catch (Exception e) 527 catch (Exception e)
528 { 528 {
529 MainLog.Instance.Debug("LAND", 529 m_log.Debug("[LAND]: Skipped Land checks because avatar is out of bounds: " + e.Message);
530 "Skipped Land checks because avatar is out of bounds: " + e.Message);
531 } 530 }
532 } 531 }
533 } 532 }