aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorlbsa712007-07-16 21:53:39 +0000
committerlbsa712007-07-16 21:53:39 +0000
commitf35f5ddaf753d88d2a5ed7c334a8cc1a4ad23664 (patch)
tree210f6cbfde37e62e31142782c7f33f6cea172cb2 /OpenSim/Region/ClientStack
parent* Reset IP in SimpleApp back to localhost (diff)
downloadopensim-SC_OLD-f35f5ddaf753d88d2a5ed7c334a8cc1a4ad23664.zip
opensim-SC_OLD-f35f5ddaf753d88d2a5ed7c334a8cc1a4ad23664.tar.gz
opensim-SC_OLD-f35f5ddaf753d88d2a5ed7c334a8cc1a4ad23664.tar.bz2
opensim-SC_OLD-f35f5ddaf753d88d2a5ed7c334a8cc1a4ad23664.tar.xz
* And yet more restructuring of startup sequence...
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs16
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 043659b..8467082 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -38,6 +38,7 @@ using OpenSim.Physics.Manager;
38using OpenSim.Region.Caches; 38using OpenSim.Region.Caches;
39using OpenSim.Region.Environment; 39using OpenSim.Region.Environment;
40using libsecondlife; 40using libsecondlife;
41using OpenSim.Region.Environment.Scenes;
41 42
42namespace OpenSim.Region.ClientStack 43namespace OpenSim.Region.ClientStack
43{ 44{
@@ -49,10 +50,11 @@ namespace OpenSim.Region.ClientStack
49 protected DateTime m_startuptime; 50 protected DateTime m_startuptime;
50 protected NetworkServersInfo m_networkServersInfo; 51 protected NetworkServersInfo m_networkServersInfo;
51 52
52 protected List<UDPServer> m_udpServer = new List<UDPServer>(); 53 protected List<UDPServer> m_udpServers = new List<UDPServer>();
53 protected List<RegionInfo> m_regionData = new List<RegionInfo>(); 54 protected List<RegionInfo> m_regionData = new List<RegionInfo>();
54 protected List<IWorld> m_localWorld = new List<IWorld>(); 55 protected List<IWorld> m_localWorld = new List<IWorld>();
55 protected BaseHttpServer m_httpServer; 56 protected BaseHttpServer m_httpServer;
57 protected int m_httpServerPort;
56 protected List<AuthenticateSessionsBase> AuthenticateSessionsHandler = new List<AuthenticateSessionsBase>(); 58 protected List<AuthenticateSessionsBase> AuthenticateSessionsHandler = new List<AuthenticateSessionsBase>();
57 59
58 protected LogBase m_log; 60 protected LogBase m_log;
@@ -72,20 +74,26 @@ namespace OpenSim.Region.ClientStack
72 74
73 StartLog(); 75 StartLog();
74 76
77 ScenePresence.LoadTextureFile("avatar-texture.dat");
78
79 m_httpServer = new BaseHttpServer( m_httpServerPort );
80
81 m_log.Verbose("Starting HTTP server");
82 m_httpServer.Start();
75 } 83 }
76 84
77 protected abstract void Initialize(); 85 protected abstract void Initialize();
78 86
79 private void StartLog() 87 private void StartLog()
80 { 88 {
81 LogBase logBase = CreateLog(); 89 m_log = CreateLog();
82 m_log = logBase;
83 MainLog.Instance = m_log; 90 MainLog.Instance = m_log;
84 } 91 }
85 92
86 protected abstract LogBase CreateLog(); 93 protected abstract LogBase CreateLog();
87 protected abstract PhysicsScene GetPhysicsScene( ); 94 protected abstract PhysicsScene GetPhysicsScene( );
88 95 protected abstract StorageManager GetStoreManager(RegionInfo regionInfo);
96
89 protected PhysicsScene GetPhysicsScene(string engine) 97 protected PhysicsScene GetPhysicsScene(string engine)
90 { 98 {
91 PhysicsPluginManager physicsPluginManager; 99 PhysicsPluginManager physicsPluginManager;