From af265e001d3bf043590e480cd6574a14193f6de0 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Mon, 15 Feb 2010 19:15:03 +0900
Subject: Formatting cleanup.

---
 OpenSim/Region/Application/OpenSim.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Application')

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index a86a831..96eceb0 100755
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -367,7 +367,6 @@ namespace OpenSim
             m_console.Commands.AddCommand("hypergrid", false, "unlink-region",
                                           "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
                                           "Unlink a hypergrid region", RunCommand);
-
         }
 
         public override void ShutdownSpecific()
@@ -433,7 +432,7 @@ namespace OpenSim
                     // kick client...
                     if (alert != null)
                         presence.ControllingClient.Kick(alert);
-                    else 
+                    else
                         presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
 
                     // ...and close on our side
@@ -640,7 +639,6 @@ namespace OpenSim
             }
         }
 
-
         /// <summary>
         /// Load, Unload, and list Region modules in use
         /// </summary>
@@ -972,7 +970,6 @@ namespace OpenSim
                                            scene.RegionInfo.RegionLocX,
                                            scene.RegionInfo.RegionLocY,
                                            scene.RegionInfo.InternalEndPoint.Port));
-                                
                             });
                     break;
 
@@ -1097,7 +1094,7 @@ namespace OpenSim
             }
             else
             {
-	      MainConsole.Instance.Output(string.Format("A user with the name {0} {1} already exists!", firstName, lastName));
+                MainConsole.Instance.Output(string.Format("A user with the name {0} {1} already exists!", firstName, lastName));
             }
         }
 
-- 
cgit v1.1


From 842b68eeff7571d3c82415c65065bec3c95f34ea Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 18 Feb 2010 04:19:33 +0000
Subject: Change handling of the SYSTEMIP constant to be more sane. This will
 now choose the first network interface IP address, or the loopback interface
 if no external interfaces are found. It will log the IP address used as
 [NETWORK]: Using x.x.x.x for SYSTEMIP.

---
 OpenSim/Region/Application/OpenSim.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Region/Application')

diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 96eceb0..05e283e 100755
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -190,6 +190,8 @@ namespace OpenSim
 
             PrintFileToConsole("startuplogo.txt");
 
+            m_log.InfoFormat("[NETWORK]: Using {0} as SYSTEMIP", Util.GetLocalHost().ToString());
+
             // For now, start at the 'root' level by default
             if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it
                 ChangeSelectedRegion("region",
-- 
cgit v1.1