From c1115e4c2e8a35fee3287add748881f3718deba5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 14 Mar 2013 22:56:26 +0000
Subject: Add ILandChannel.GetLandObject(Vector3 position) as this is a very
 common input to GetLandObject()

This conforms to the existing ILandChannel.ParcelsNearPoint() method
---
 OpenSim/Framework/ILandChannel.cs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/ILandChannel.cs b/OpenSim/Framework/ILandChannel.cs
index 869d4c8..c46c03c 100644
--- a/OpenSim/Framework/ILandChannel.cs
+++ b/OpenSim/Framework/ILandChannel.cs
@@ -56,6 +56,13 @@ namespace OpenSim.Region.Framework.Interfaces
         ILandObject GetLandObject(float x, float y);
 
         /// <summary>
+        /// Get the parcel at the specified point
+        /// </summary>
+        /// <param name="position">Vector where x and y components are between 0 and 256.  z component is ignored.</param>
+        /// <returns>Land object at the point supplied</returns>
+        ILandObject GetLandObject(Vector3 position);
+
+        /// <summary>
         /// Get the parcels near the specified point
         /// </summary>
         /// <param name="position"></param>
-- 
cgit v1.1


From 12900ea84e699f84943009f2d3218fcf5013c6f9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 14 Mar 2013 23:39:15 +0000
Subject: Log same environment information to Robust log as is already done for
 simulator logs, for debug purposes

---
 OpenSim/Framework/Servers/BaseOpenSimServer.cs | 12 +-----------
 OpenSim/Framework/Servers/ServerBase.cs        | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index c0dc907..035b3ad 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -133,17 +133,7 @@ namespace OpenSim.Framework.Servers
         /// Performs initialisation of the scene, such as loading configuration from disk.
         /// </summary>
         public virtual void Startup()
-        {
-            m_log.Info("[STARTUP]: Beginning startup processing");
-            
-            m_log.Info("[STARTUP]: OpenSimulator version: " + m_version + Environment.NewLine);
-            // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
-            // the clr version number doesn't match the project version number under Mono.
-            //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
-            m_log.InfoFormat(
-                "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n",
-                Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
-            
+        {            
             StartupSpecific();
             
             TimeSpan timeTaken = DateTime.Now - m_startuptime;
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 47baac8..657444c 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -113,6 +113,26 @@ namespace OpenSim.Framework.Servers
             }
         }
 
+        /// <summary>
+        /// Log information about the circumstances in which we're running (OpenSimulator version number, CLR details,
+        /// etc.).
+        /// </summary>
+        public void LogEnvironmentInformation()
+        {
+            // FIXME: This should be done down in ServerBase but we need to sort out and refactor the log4net
+            // XmlConfigurator calls first accross servers.
+            m_log.InfoFormat("[SERVER BASE]: Starting in {0}", m_startupDirectory);
+
+            m_log.InfoFormat("[SERVER BASE]: OpenSimulator version: {0}", m_version);
+
+            // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
+            // the clr version number doesn't match the project version number under Mono.
+            //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
+            m_log.InfoFormat(
+                "[SERVER BASE]: Operating system version: {0}, .NET platform {1}, {2}-bit",
+                Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
+        }
+
         public void RegisterCommonAppenders(IConfig startupConfig)
         {
             ILoggerRepository repository = LogManager.GetRepository();
-- 
cgit v1.1