aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorlbsa712009-03-10 19:55:59 +0000
committerlbsa712009-03-10 19:55:59 +0000
commita8ae02df4f29eeed15f449798f7f4433c35a735e (patch)
treeb4f51590fcc4fcc417a678e56b833b9c7598664f /OpenSim/ApplicationPlugins
parent* minor: reduce some code duplication in BaseHttpServer (diff)
downloadopensim-SC_OLD-a8ae02df4f29eeed15f449798f7f4433c35a735e.zip
opensim-SC_OLD-a8ae02df4f29eeed15f449798f7f4433c35a735e.tar.gz
opensim-SC_OLD-a8ae02df4f29eeed15f449798f7f4433c35a735e.tar.bz2
opensim-SC_OLD-a8ae02df4f29eeed15f449798f7f4433c35a735e.tar.xz
* Cleanup and CCC (Code Convention Conformance)
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs42
1 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index ec14b97..4fc3094 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -26,24 +26,15 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Reflection; 29using System.Reflection;
31using System.Threading;
32using log4net; 30using log4net;
33using OpenSim.Framework; 31using OpenSim.Framework;
34using OpenSim.Framework.RegionLoader.Filesystem;
35using OpenSim.Framework.RegionLoader.Web;
36using OpenSim.Region.CoreModules.Agent.AssetTransaction;
37using OpenSim.Region.CoreModules.Avatar.InstantMessage;
38using OpenSim.Region.CoreModules.Scripting.DynamicTexture;
39using OpenSim.Region.CoreModules.Scripting.LoadImageURL;
40using OpenSim.Region.CoreModules.Scripting.XMLRPC;
41using OpenSim.Framework.Communications; 32using OpenSim.Framework.Communications;
42using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
34using OpenSim.Framework.Servers;
43using OpenSim.Region.Communications.Hypergrid; 35using OpenSim.Region.Communications.Hypergrid;
44using OpenSim.Region.Communications.Local; 36using OpenSim.Region.Communications.Local;
45using OpenSim.Region.Communications.OGS1; 37using OpenSim.Region.Communications.OGS1;
46using OpenSim.Framework.Servers;
47 38
48namespace OpenSim.ApplicationPlugins.CreateCommsManager 39namespace OpenSim.ApplicationPlugins.CreateCommsManager
49{ 40{
@@ -54,11 +45,18 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
54 #region IApplicationPlugin Members 45 #region IApplicationPlugin Members
55 46
56 // TODO: required by IPlugin, but likely not at all right 47 // TODO: required by IPlugin, but likely not at all right
57 string m_name = "CreateCommsManagerPlugin"; 48 private string m_name = "CreateCommsManagerPlugin";
58 string m_version = "0.0"; 49 private string m_version = "0.0";
50
51 public string Version
52 {
53 get { return m_version; }
54 }
59 55
60 public string Version { get { return m_version; } } 56 public string Name
61 public string Name { get { return m_name; } } 57 {
58 get { return m_name; }
59 }
62 60
63 protected OpenSimBase m_openSim; 61 protected OpenSimBase m_openSim;
64 62
@@ -133,7 +131,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
133 HGOpenSimNode hgNode = null; 131 HGOpenSimNode hgNode = null;
134 try 132 try
135 { 133 {
136 hgNode = (HGOpenSimNode)openSim; 134 hgNode = (HGOpenSimNode) openSim;
137 } 135 }
138 catch (Exception e) 136 catch (Exception e)
139 { 137 {
@@ -178,12 +176,14 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
178 protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder) 176 protected virtual void InitialiseStandaloneServices(LibraryRootFolder libraryRootFolder)
179 { 177 {
180 LocalInventoryService inventoryService = new LocalInventoryService(); 178 LocalInventoryService inventoryService = new LocalInventoryService();
181 inventoryService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneInventoryPlugin, m_openSim.ConfigurationSettings.StandaloneInventorySource); 179 inventoryService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneInventoryPlugin,
180 m_openSim.ConfigurationSettings.StandaloneInventorySource);
182 181
183 LocalUserServices userService = 182 LocalUserServices userService =
184 new LocalUserServices( 183 new LocalUserServices(
185 m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService); 184 m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService);
186 userService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource); 185 userService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin,
186 m_openSim.ConfigurationSettings.StandaloneUserSource);
187 187
188 LocalBackEndServices backendService = new LocalBackEndServices(); 188 LocalBackEndServices backendService = new LocalBackEndServices();
189 189
@@ -215,12 +215,12 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
215 215
216 LocalUserServices userService = 216 LocalUserServices userService =
217 new LocalUserServices( 217 new LocalUserServices(
218 m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService); 218 m_openSim.NetServersInfo.DefaultHomeLocX, m_openSim.NetServersInfo.DefaultHomeLocY, inventoryService);
219 userService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource); 219 userService.AddPlugin(m_openSim.ConfigurationSettings.StandaloneUserPlugin, m_openSim.ConfigurationSettings.StandaloneUserSource);
220 220
221 HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager); 221 HGGridServicesStandalone gridService = new HGGridServicesStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager);
222 222
223 // LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, gridService.LocalBackend); 223 // LocalLoginService loginService = CreateLoginService(libraryRootFolder, inventoryService, userService, gridService.LocalBackend);
224 224
225 m_commsManager = new HGCommunicationsStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, 225 m_commsManager = new HGCommunicationsStandalone(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache,
226 userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile); 226 userService, userService, inventoryService, gridService, userService, libraryRootFolder, m_openSim.ConfigurationSettings.DumpAssetsToFile);
@@ -236,7 +236,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
236 { 236 {
237 m_commsManager = new HGCommunicationsGridMode(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder); 237 m_commsManager = new HGCommunicationsGridMode(m_openSim.NetServersInfo, m_httpServer, m_openSim.AssetCache, m_openSim.SceneManager, libraryRootFolder);
238 238
239 HGServices = ((HGCommunicationsGridMode)m_commsManager).HGServices; 239 HGServices = ((HGCommunicationsGridMode) m_commsManager).HGServices;
240 240
241 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); 241 m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler());
242 } 242 }
@@ -268,4 +268,4 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager
268 m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod)); 268 m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
269 } 269 }
270 } 270 }
271} 271} \ No newline at end of file