aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleApp
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Examples/SimpleApp')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs20
1 files changed, 11 insertions, 9 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 6c18540..f919276 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -51,9 +51,9 @@ namespace SimpleApp
51 private string m_userPlugin = "OpenSim.Framework.Data.SQLite.dll"; 51 private string m_userPlugin = "OpenSim.Framework.Data.SQLite.dll";
52 private string m_inventoryPlugin = "OpenSim.Framework.Data.SQLite.dll"; 52 private string m_inventoryPlugin = "OpenSim.Framework.Data.SQLite.dll";
53 53
54 protected override LogBase CreateLog() 54 protected override ConsoleBase CreateConsole()
55 { 55 {
56 return new LogBase(null, "SimpleApp", this, true); 56 return new ConsoleBase("SimpleApp", this);
57 } 57 }
58 58
59 protected override void Initialize() 59 protected override void Initialize()
@@ -64,12 +64,12 @@ namespace SimpleApp
64 64
65 LocalAssetServer assetServer = new LocalAssetServer(); 65 LocalAssetServer assetServer = new LocalAssetServer();
66 66
67 m_assetCache = new AssetCache(assetServer, m_log); 67 m_assetCache = new AssetCache(assetServer);
68 } 68 }
69 69
70 public void Run() 70 public void Run()
71 { 71 {
72 StartLog(); 72 StartConsole();
73 StartUp(); 73 StartUp();
74 74
75 LocalInventoryService inventoryService = new LocalInventoryService(); 75 LocalInventoryService inventoryService = new LocalInventoryService();
@@ -94,7 +94,7 @@ namespace SimpleApp
94 94
95 m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); 95 m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);
96 96
97 m_log.Notice(m_log.LineInfo); 97 m_console.Notice(m_console.LineInfo);
98 98
99 IPEndPoint internalEndPoint = 99 IPEndPoint internalEndPoint =
100 new IPEndPoint(IPAddress.Parse("127.0.0.1"), (int) m_networkServersInfo.HttpListenerPort); 100 new IPEndPoint(IPAddress.Parse("127.0.0.1"), (int) m_networkServersInfo.HttpListenerPort);
@@ -104,7 +104,7 @@ namespace SimpleApp
104 104
105 UDPServer udpServer; 105 UDPServer udpServer;
106 106
107 m_moduleLoader = new ModuleLoader(m_log, m_config); 107 m_moduleLoader = new ModuleLoader(m_config);
108 m_moduleLoader.LoadDefaultSharedModules(); 108 m_moduleLoader.LoadDefaultSharedModules();
109 109
110 Scene scene = SetupScene(regionInfo, out udpServer, false); 110 Scene scene = SetupScene(regionInfo, out udpServer, false);
@@ -170,8 +170,8 @@ namespace SimpleApp
170 scene.AddEntity(fileObject); 170 scene.AddEntity(fileObject);
171 } 171 }
172 172
173 m_log.Notice("Press enter to quit."); 173 m_console.Notice("Press enter to quit.");
174 m_log.ReadLine(); 174 m_console.ReadLine();
175 } 175 }
176 176
177 protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, 177 protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager,
@@ -182,7 +182,7 @@ namespace SimpleApp
182 return 182 return
183 new MyWorld(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService, 183 new MyWorld(regionInfo, circuitManager, permissionManager, m_commsManager, sceneGridService,
184 m_assetCache, storageManager, m_httpServer, 184 m_assetCache, storageManager, m_httpServer,
185 new ModuleLoader(m_log, m_config), true, false); 185 new ModuleLoader(m_config), true, false);
186 } 186 }
187 187
188 protected override StorageManager CreateStorageManager(string connectionstring) 188 protected override StorageManager CreateStorageManager(string connectionstring)
@@ -211,6 +211,8 @@ namespace SimpleApp
211 211
212 private static void Main(string[] args) 212 private static void Main(string[] args)
213 { 213 {
214 log4net.Config.XmlConfigurator.Configure();
215
214 Program app = new Program(); 216 Program app = new Program();
215 217
216 app.Run(); 218 app.Run();