aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs34
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs14
2 files changed, 24 insertions, 24 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 5409fea..05ccbc3 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -83,7 +83,7 @@ namespace OpenSim
83 /// </summary> 83 /// </summary>
84 public void StartUp() 84 public void StartUp()
85 { 85 {
86 this.serversData = new NetworkServersInfo(); 86 this.m_serversData = new NetworkServersInfo();
87 87
88 this.localConfig = new XmlConfig(m_config); 88 this.localConfig = new XmlConfig(m_config);
89 this.localConfig.LoadData(); 89 this.localConfig.LoadData();
@@ -97,7 +97,7 @@ namespace OpenSim
97 MainLog.Instance = m_log; 97 MainLog.Instance = m_log;
98 98
99 m_log.Verbose("Main.cs:Startup() - Loading configuration"); 99 m_log.Verbose("Main.cs:Startup() - Loading configuration");
100 this.serversData.InitConfig(this.m_sandbox, this.localConfig); 100 this.m_serversData.InitConfig(this.m_sandbox, this.localConfig);
101 this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change 101 this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
102 102
103 ScenePresence.LoadTextureFile("avatar-texture.dat"); 103 ScenePresence.LoadTextureFile("avatar-texture.dat");
@@ -117,7 +117,7 @@ namespace OpenSim
117 this.SetupRemoteGridServers(); 117 this.SetupRemoteGridServers();
118 } 118 }
119 119
120 startuptime = DateTime.Now; 120 m_startuptime = DateTime.Now;
121 121
122 this.SetupScene(); 122 this.SetupScene();
123 123
@@ -125,7 +125,7 @@ namespace OpenSim
125 125
126 //Start http server 126 //Start http server
127 m_log.Verbose("Main.cs:Startup() - Starting HTTP server"); 127 m_log.Verbose("Main.cs:Startup() - Starting HTTP server");
128 httpServer.Start(); 128 m_httpServer.Start();
129 129
130 // Start UDP servers 130 // Start UDP servers
131 for (int i = 0; i < m_udpServer.Count; i++) 131 for (int i = 0; i < m_udpServer.Count; i++)
@@ -140,9 +140,9 @@ namespace OpenSim
140 { 140 {
141 try 141 try
142 { 142 {
143 AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey); 143 m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.m_serversData.AssetURL, this.m_serversData.AssetSendKey);
144 InventoryCache = new InventoryCache(); 144 m_inventoryCache = new InventoryCache();
145 this.commsManager = new CommunicationsLocal(this.serversData, httpServer); 145 this.commsManager = new CommunicationsLocal(this.m_serversData, m_httpServer);
146 } 146 }
147 catch (Exception e) 147 catch (Exception e)
148 { 148 {
@@ -156,9 +156,9 @@ namespace OpenSim
156 { 156 {
157 try 157 try
158 { 158 {
159 AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey); 159 m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.m_serversData.AssetURL, this.m_serversData.AssetSendKey);
160 InventoryCache = new InventoryCache(); 160 m_inventoryCache = new InventoryCache();
161 this.commsManager = new CommunicationsOGS1(this.serversData, httpServer); 161 this.commsManager = new CommunicationsOGS1(this.m_serversData, m_httpServer);
162 } 162 }
163 catch (Exception e) 163 catch (Exception e)
164 { 164 {
@@ -213,14 +213,14 @@ namespace OpenSim
213 regionDat.InitConfig(this.m_sandbox, regionConfig); 213 regionDat.InitConfig(this.m_sandbox, regionConfig);
214 regionConfig.Close(); 214 regionConfig.Close();
215 215
216 udpServer = new UDPServer(regionDat.InternalEndPoint.Port, this.AssetCache, this.InventoryCache, this.m_log, authenBase); 216 udpServer = new UDPServer(regionDat.InternalEndPoint.Port, m_assetCache, this.m_inventoryCache, this.m_log, authenBase);
217 217
218 m_udpServer.Add(udpServer); 218 m_udpServer.Add(udpServer);
219 this.regionData.Add(regionDat); 219 this.m_regionData.Add(regionDat);
220 220
221 StorageManager tmpStoreManager = new StorageManager("OpenSim.DataStore.NullStorage.dll", regionDat.DataStore, regionDat.RegionName); 221 StorageManager tmpStoreManager = new StorageManager("OpenSim.DataStore.NullStorage.dll", regionDat.DataStore, regionDat.RegionName);
222 222
223 scene = new Scene( regionDat, authenBase, commsManager, this.AssetCache, tmpStoreManager, httpServer); 223 scene = new Scene( regionDat, authenBase, commsManager, m_assetCache, tmpStoreManager, m_httpServer);
224 this.m_localWorld.Add(scene); 224 this.m_localWorld.Add(scene);
225 225
226 udpServer.LocalWorld = scene; 226 udpServer.LocalWorld = scene;
@@ -286,11 +286,11 @@ namespace OpenSim
286 286
287 protected void SetupHttpListener() 287 protected void SetupHttpListener()
288 { 288 {
289 httpServer = new BaseHttpServer(this.serversData.HttpListenerPort); //regionData[0].IPListenPort); 289 m_httpServer = new BaseHttpServer(this.m_serversData.HttpListenerPort); //regionData[0].IPListenPort);
290 290
291 if (!this.m_sandbox) 291 if (!this.m_sandbox)
292 { 292 {
293 httpServer.AddStreamHandler( new SimStatusHandler() ); 293 m_httpServer.AddStreamHandler( new SimStatusHandler() );
294 } 294 }
295 } 295 }
296 296
@@ -485,8 +485,8 @@ namespace OpenSim
485 switch (ShowWhat) 485 switch (ShowWhat)
486 { 486 {
487 case "uptime": 487 case "uptime":
488 m_log.Error("OpenSim has been running since " + startuptime.ToString()); 488 m_log.Error("OpenSim has been running since " + m_startuptime.ToString());
489 m_log.Error("That is " + (DateTime.Now - startuptime).ToString()); 489 m_log.Error("That is " + (DateTime.Now - m_startuptime).ToString());
490 break; 490 break;
491 case "users": 491 case "users":
492 ScenePresence TempAv; 492 ScenePresence TempAv;
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index adf30bc..ec7eee4 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -42,16 +42,16 @@ namespace OpenSim.Region.ClientStack
42{ 42{
43 public class RegionApplicationBase 43 public class RegionApplicationBase
44 { 44 {
45 protected AssetCache AssetCache; 45 protected AssetCache m_assetCache;
46 protected InventoryCache InventoryCache; 46 protected InventoryCache m_inventoryCache;
47 protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); 47 protected Dictionary<EndPoint, uint> m_clientCircuits = new Dictionary<EndPoint, uint>();
48 protected DateTime startuptime; 48 protected DateTime m_startuptime;
49 protected NetworkServersInfo serversData; 49 protected NetworkServersInfo m_serversData;
50 50
51 protected List<UDPServer> m_udpServer = new List<UDPServer>(); 51 protected List<UDPServer> m_udpServer = new List<UDPServer>();
52 protected List<RegionInfo> regionData = new List<RegionInfo>(); 52 protected List<RegionInfo> m_regionData = new List<RegionInfo>();
53 protected List<IWorld> m_localWorld = new List<IWorld>(); 53 protected List<IWorld> m_localWorld = new List<IWorld>();
54 protected BaseHttpServer httpServer; 54 protected BaseHttpServer m_httpServer;
55 protected List<AuthenticateSessionsBase> AuthenticateSessionsHandler = new List<AuthenticateSessionsBase>(); 55 protected List<AuthenticateSessionsBase> AuthenticateSessionsHandler = new List<AuthenticateSessionsBase>();
56 56
57 protected LogBase m_log; 57 protected LogBase m_log;