aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorJohn Hurliman2010-02-22 14:10:19 -0800
committerJohn Hurliman2010-02-22 14:10:19 -0800
commit71c6559a91a58d93588dcdd8c74b5fce0c1a3780 (patch)
treecca5b1ea88ad4b29156767afdd77e37ec072c8a7 /OpenSim/Region/Application
parent* Adds CreatorID to asset metadata. This is just the plumbing to support Crea... (diff)
parentMerge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff)
downloadopensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.zip
opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.gz
opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.bz2
opensim-SC_OLD-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.xz
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Region/Application')
-rwxr-xr-xOpenSim/Region/Application/OpenSim.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index acd6a14..7e81650 100755
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -194,6 +194,8 @@ namespace OpenSim
194 194
195 PrintFileToConsole("startuplogo.txt"); 195 PrintFileToConsole("startuplogo.txt");
196 196
197 m_log.InfoFormat("[NETWORK]: Using {0} as SYSTEMIP", Util.GetLocalHost().ToString());
198
197 // For now, start at the 'root' level by default 199 // For now, start at the 'root' level by default
198 if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it 200 if (m_sceneManager.Scenes.Count == 1) // If there is only one region, select it
199 ChangeSelectedRegion("region", 201 ChangeSelectedRegion("region",
@@ -417,7 +419,7 @@ namespace OpenSim
417 // kick client... 419 // kick client...
418 if (alert != null) 420 if (alert != null)
419 presence.ControllingClient.Kick(alert); 421 presence.ControllingClient.Kick(alert);
420 else 422 else
421 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n"); 423 presence.ControllingClient.Kick("\nThe OpenSim manager kicked you out.\n");
422 424
423 // ...and close on our side 425 // ...and close on our side
@@ -624,7 +626,6 @@ namespace OpenSim
624 } 626 }
625 } 627 }
626 628
627
628 /// <summary> 629 /// <summary>
629 /// Load, Unload, and list Region modules in use 630 /// Load, Unload, and list Region modules in use
630 /// </summary> 631 /// </summary>
@@ -924,7 +925,6 @@ namespace OpenSim
924 scene.RegionInfo.RegionLocX, 925 scene.RegionInfo.RegionLocX,
925 scene.RegionInfo.RegionLocY, 926 scene.RegionInfo.RegionLocY,
926 scene.RegionInfo.InternalEndPoint.Port)); 927 scene.RegionInfo.InternalEndPoint.Port));
927
928 }); 928 });
929 break; 929 break;
930 930