diff options
author | lbsa71 | 2007-07-20 14:16:12 +0000 |
---|---|---|
committer | lbsa71 | 2007-07-20 14:16:12 +0000 |
commit | 2da8a7c12818f7944ce2cc2b2cb324439e48daa2 (patch) | |
tree | d10b9917637a72c594b0ed3c3600ee870687b6b0 /OpenSim/Region | |
parent | * Assortment of Console changes - console messages are now grouped into modul... (diff) | |
download | opensim-SC-2da8a7c12818f7944ce2cc2b2cb324439e48daa2.zip opensim-SC-2da8a7c12818f7944ce2cc2b2cb324439e48daa2.tar.gz opensim-SC-2da8a7c12818f7944ce2cc2b2cb324439e48daa2.tar.bz2 opensim-SC-2da8a7c12818f7944ce2cc2b2cb324439e48daa2.tar.xz |
* Fixed an config issue (log not initialized in RegionInfo config)
* Added LineInfo stacktrace parser to LogBase (not used yet though)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/Program.cs | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 3c11b90..6b7026c 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -151,6 +151,7 @@ namespace OpenSim | |||
151 | 151 | ||
152 | protected override void Initialize() | 152 | protected override void Initialize() |
153 | { | 153 | { |
154 | m_networkServersInfo = new NetworkServersInfo("NETWORK SERVERS INFO", "network_servers_information.xml"); | ||
154 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; | 155 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; |
155 | m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); | 156 | m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); |
156 | } | 157 | } |
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 8de9bde..4a1fd99 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -67,10 +67,9 @@ namespace OpenSim.Region.ClientStack | |||
67 | { | 67 | { |
68 | 68 | ||
69 | ClientView.TerrainManager = new TerrainManager(new SecondLife()); | 69 | ClientView.TerrainManager = new TerrainManager(new SecondLife()); |
70 | m_networkServersInfo = new NetworkServersInfo("NETWORK SERVERS INFO", "network_servers_information.xml"); | ||
71 | 70 | ||
72 | Initialize(); | 71 | Initialize(); |
73 | 72 | ||
74 | ScenePresence.LoadTextureFile("avatar-texture.dat"); | 73 | ScenePresence.LoadTextureFile("avatar-texture.dat"); |
75 | 74 | ||
76 | m_httpServer = new BaseHttpServer( m_httpServerPort ); | 75 | m_httpServer = new BaseHttpServer( m_httpServerPort ); |
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index 82dba0e..5c16d6b 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs | |||
@@ -34,6 +34,9 @@ namespace SimpleApp | |||
34 | 34 | ||
35 | StartLog(); | 35 | StartLog(); |
36 | 36 | ||
37 | m_networkServersInfo = new NetworkServersInfo( ); | ||
38 | |||
39 | |||
37 | LocalAssetServer assetServer = new LocalAssetServer(); | 40 | LocalAssetServer assetServer = new LocalAssetServer(); |
38 | assetServer.SetServerInfo("http://localhost:8003/", ""); | 41 | assetServer.SetServerInfo("http://localhost:8003/", ""); |
39 | 42 | ||
@@ -46,6 +49,8 @@ namespace SimpleApp | |||
46 | 49 | ||
47 | m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer); | 50 | m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer); |
48 | 51 | ||
52 | m_log.Notice(m_log.LineInfo); | ||
53 | |||
49 | ScenePresence.PhysicsEngineFlying = true; | 54 | ScenePresence.PhysicsEngineFlying = true; |
50 | 55 | ||
51 | IPEndPoint internalEndPoint = new IPEndPoint(IPAddress.Parse("127.0.0.1"), 9000); | 56 | IPEndPoint internalEndPoint = new IPEndPoint(IPAddress.Parse("127.0.0.1"), 9000); |