aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2015-09-04 09:40:21 -0700
committerDiva Canto2015-09-04 09:40:21 -0700
commit9d7e310e21b6405f1ecde074e9b7d4ea29c76ad7 (patch)
tree31e7b3f551d1033348781c1eaef8d0345e461ae6
parentTransformed the LLUDP ad-hoc plugin into a region module. It works. (diff)
downloadopensim-SC_OLD-9d7e310e21b6405f1ecde074e9b7d4ea29c76ad7.zip
opensim-SC_OLD-9d7e310e21b6405f1ecde074e9b7d4ea29c76ad7.tar.gz
opensim-SC_OLD-9d7e310e21b6405f1ecde074e9b7d4ea29c76ad7.tar.bz2
opensim-SC_OLD-9d7e310e21b6405f1ecde074e9b7d4ea29c76ad7.tar.xz
Deleted commented code
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs51
1 files changed, 0 insertions, 51 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 6e984d8..83c07f1 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -693,35 +693,8 @@ namespace OpenSim
693 //List<IClientNetworkServer> clientNetworkServers = null; 693 //List<IClientNetworkServer> clientNetworkServers = null;
694 694
695 AgentCircuitManager circuitManager = new AgentCircuitManager(); 695 AgentCircuitManager circuitManager = new AgentCircuitManager();
696 //IPAddress listenIP = regionInfo.InternalEndPoint.Address;
697 ////if (!IPAddress.TryParse(regionInfo.InternalEndPoint, out listenIP))
698 //// listenIP = IPAddress.Parse("0.0.0.0");
699
700 //uint port = (uint) regionInfo.InternalEndPoint.Port;
701
702 //if (m_autoCreateClientStack)
703 //{
704 // clientNetworkServers = m_clientStackManager.CreateServers(
705 // listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, configSource,
706 // circuitManager);
707 //}
708 //else
709 //{
710 // clientServer = null;
711 //}
712
713 //regionInfo.InternalEndPoint.Port = (int) port;
714
715 Scene scene = CreateScene(regionInfo, m_simulationDataService, m_estateDataService, circuitManager); 696 Scene scene = CreateScene(regionInfo, m_simulationDataService, m_estateDataService, circuitManager);
716 697
717 //if (m_autoCreateClientStack)
718 //{
719 // foreach (IClientNetworkServer clientnetserver in clientNetworkServers)
720 // {
721 // clientnetserver.AddScene(scene);
722 // }
723 //}
724 //clientServer = clientNetworkServers;
725 scene.LoadWorldMap(); 698 scene.LoadWorldMap();
726 699
727 return scene; 700 return scene;
@@ -736,30 +709,6 @@ namespace OpenSim
736 Config, m_version); 709 Config, m_version);
737 } 710 }
738 711
739 //protected void ShutdownClientServer(RegionInfo whichRegion)
740 //{
741 // // Close and remove the clientserver for a region
742 // bool foundClientServer = false;
743 // int clientServerElement = 0;
744 // Location location = new Location(whichRegion.RegionHandle);
745
746 // for (int i = 0; i < m_clientServers.Count; i++)
747 // {
748 // if (m_clientServers[i].HandlesRegion(location))
749 // {
750 // clientServerElement = i;
751 // foundClientServer = true;
752 // break;
753 // }
754 // }
755
756 // if (foundClientServer)
757 // {
758 // m_clientServers[clientServerElement].Stop();
759 // m_clientServers.RemoveAt(clientServerElement);
760 // }
761 //}
762
763 protected virtual void HandleRestartRegion(RegionInfo whichRegion) 712 protected virtual void HandleRestartRegion(RegionInfo whichRegion)
764 { 713 {
765 m_log.InfoFormat( 714 m_log.InfoFormat(