aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs18
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs15
-rw-r--r--OpenSim/Framework/Statistics/AssetStatsReporter.cs2
-rw-r--r--OpenSim/Framework/Statistics/StatsManager.cs28
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs10
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs14
-rw-r--r--OpenSim/Grid/UserServer/Main.cs12
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs4
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs11
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs6
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs4
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs5
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs4
13 files changed, 59 insertions, 74 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 1707607..865349f 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -46,9 +46,7 @@ namespace OpenSim.Framework.UserManagement
46 { 46 {
47 protected string m_welcomeMessage = "Welcome to OpenSim"; 47 protected string m_welcomeMessage = "Welcome to OpenSim";
48 protected UserManagerBase m_userManager = null; 48 protected UserManagerBase m_userManager = null;
49 protected Mutex m_loginMutex = new Mutex(false); 49 protected Mutex m_loginMutex = new Mutex(false);
50
51 protected UserStatsReporter m_statsCollector;
52 50
53 /// <summary> 51 /// <summary>
54 /// Used during login to send the skeleton of the OpenSim Library to the client. 52 /// Used during login to send the skeleton of the OpenSim Library to the client.
@@ -60,16 +58,12 @@ namespace OpenSim.Framework.UserManagement
60 /// </summary> 58 /// </summary>
61 /// <param name="userManager"></param> 59 /// <param name="userManager"></param>
62 /// <param name="libraryRootFolder"></param> 60 /// <param name="libraryRootFolder"></param>
63 /// <param name="statsCollector">
64 /// An object for collecting statistical information.
65 /// Can be null if statistics are not required</param>
66 /// <param name="welcomeMess"></param> 61 /// <param name="welcomeMess"></param>
67 public LoginService(UserManagerBase userManager, LibraryRootFolder libraryRootFolder, 62 public LoginService(UserManagerBase userManager, LibraryRootFolder libraryRootFolder,
68 UserStatsReporter statsCollector, string welcomeMess) 63 string welcomeMess)
69 { 64 {
70 m_userManager = userManager; 65 m_userManager = userManager;
71 m_libraryRootFolder = libraryRootFolder; 66 m_libraryRootFolder = libraryRootFolder;
72 m_statsCollector = statsCollector;
73 67
74 if (welcomeMess != String.Empty) 68 if (welcomeMess != String.Empty)
75 { 69 {
@@ -226,8 +220,8 @@ namespace OpenSim.Framework.UserManagement
226 CommitAgent(ref userProfile); 220 CommitAgent(ref userProfile);
227 221
228 // If we reach this point, then the login has successfully logged onto the grid 222 // If we reach this point, then the login has successfully logged onto the grid
229 if (m_statsCollector != null) 223 if (StatsManager.UserStats != null)
230 m_statsCollector.AddSuccessfulLogin(); 224 StatsManager.UserStats.AddSuccessfulLogin();
231 225
232 return logResponse.ToXmlRpcResponse(); 226 return logResponse.ToXmlRpcResponse();
233 } 227 }
@@ -358,8 +352,8 @@ namespace OpenSim.Framework.UserManagement
358 CommitAgent(ref userProfile); 352 CommitAgent(ref userProfile);
359 353
360 // If we reach this point, then the login has successfully logged onto the grid 354 // If we reach this point, then the login has successfully logged onto the grid
361 if (m_statsCollector != null) 355 if (StatsManager.UserStats != null)
362 m_statsCollector.AddSuccessfulLogin(); 356 StatsManager.UserStats.AddSuccessfulLogin();
363 357
364 return logResponse.ToLLSDResponse(); 358 return logResponse.ToLLSDResponse();
365 } 359 }
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 4967cd9..3b1d837 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -45,17 +45,6 @@ namespace OpenSim.Framework.UserManagement
45 { 45 {
46 public UserConfig _config; 46 public UserConfig _config;
47 private Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>(); 47 private Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
48 protected UserStatsReporter _stats;
49
50 /// <summary>
51 /// Constructor.
52 /// </summary>
53 /// <param name="statsCollector">Can be null if stats collection is not required.
54 /// </param>
55 public UserManagerBase(UserStatsReporter statsCollector)
56 {
57 _stats = statsCollector;
58 }
59 48
60 /// <summary> 49 /// <summary>
61 /// Adds a new user server plugin - user servers will be requested in the order they were loaded. 50 /// Adds a new user server plugin - user servers will be requested in the order they were loaded.
@@ -435,8 +424,8 @@ namespace OpenSim.Framework.UserManagement
435 /// <param name="posz"></param> 424 /// <param name="posz"></param>
436 public void LogOffUser(LLUUID userid, LLUUID regionid, ulong regionhandle, float posx, float posy, float posz) 425 public void LogOffUser(LLUUID userid, LLUUID regionid, ulong regionhandle, float posx, float posy, float posz)
437 { 426 {
438 if (_stats != null) 427 if (StatsManager.UserStats != null)
439 _stats.AddLogout(); 428 StatsManager.UserStats.AddLogout();
440 429
441 UserProfileData userProfile; 430 UserProfileData userProfile;
442 UserAgentData userAgent; 431 UserAgentData userAgent;
diff --git a/OpenSim/Framework/Statistics/AssetStatsReporter.cs b/OpenSim/Framework/Statistics/AssetStatsReporter.cs
index bcd3a75..4f2ef86 100644
--- a/OpenSim/Framework/Statistics/AssetStatsReporter.cs
+++ b/OpenSim/Framework/Statistics/AssetStatsReporter.cs
@@ -30,7 +30,7 @@ using System;
30using System.Text; 30using System.Text;
31using System.Timers; 31using System.Timers;
32 32
33namespace OpenSim.Grid.AssetServer 33namespace OpenSim.Framework.Statistics
34{ 34{
35 /// <summary> 35 /// <summary>
36 /// Collects and reports information on the requests made to the asset server 36 /// Collects and reports information on the requests made to the asset server
diff --git a/OpenSim/Framework/Statistics/StatsManager.cs b/OpenSim/Framework/Statistics/StatsManager.cs
index 35040e3..842f1f1 100644
--- a/OpenSim/Framework/Statistics/StatsManager.cs
+++ b/OpenSim/Framework/Statistics/StatsManager.cs
@@ -33,19 +33,39 @@ namespace OpenSim.Framework.Statistics
33 /// </summary> 33 /// </summary>
34 public class StatsManager 34 public class StatsManager
35 { 35 {
36 private static AssetStatsReporter assetStats;
37 private static UserStatsReporter userStats;
36 private static SimExtraStatsReporter simExtraStats; 38 private static SimExtraStatsReporter simExtraStats;
37 39
40 public static AssetStatsReporter AssetStats { get { return assetStats; } }
41 public static UserStatsReporter UserStats { get { return userStats; } }
38 public static SimExtraStatsReporter SimExtraStats { get { return simExtraStats; } } 42 public static SimExtraStatsReporter SimExtraStats { get { return simExtraStats; } }
39 43
40 private StatsManager() 44 private StatsManager() {}
45
46 /// <summary>
47 /// Start collecting statistics related to assets.
48 /// Should only be called once.
49 /// </summary>
50 public static void StartCollectingAssetStats()
41 { 51 {
52 assetStats = new AssetStatsReporter();
42 } 53 }
43 54
44 /// <summary> 55 /// <summary>
45 /// Start recording statistics. Should only be called once - calling again will reset statistic 56 /// Start collecting statistics related to users.
46 /// counts. 57 /// Should only be called once.
58 /// </summary>
59 public static void StartCollectingUserStats()
60 {
61 userStats = new UserStatsReporter();
62 }
63
64 /// <summary>
65 /// Start collecting extra sim statistics apart from those collected for the client.
66 /// Should only be called once.
47 /// </summary> 67 /// </summary>
48 public static void StartCollecting() 68 public static void StartCollectingSimExtraStats()
49 { 69 {
50 simExtraStats = new SimExtraStatsReporter(); 70 simExtraStats = new SimExtraStatsReporter();
51 } 71 }
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index c9f7e8e..23b0afa 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -52,9 +52,7 @@ namespace OpenSim.Grid.AssetServer
52 // Temporarily hardcoded - should be a plugin 52 // Temporarily hardcoded - should be a plugin
53 protected IAssetLoader assetLoader = new AssetLoaderFileSystem(); 53 protected IAssetLoader assetLoader = new AssetLoaderFileSystem();
54 54
55 private IAssetProvider m_assetProvider; 55 private IAssetProvider m_assetProvider;
56
57 protected AssetStatsReporter m_stats;
58 56
59 [STAThread] 57 [STAThread]
60 public static void Main(string[] args) 58 public static void Main(string[] args)
@@ -101,9 +99,9 @@ namespace OpenSim.Grid.AssetServer
101 m_console.Verbose("ASSET", "Starting HTTP process"); 99 m_console.Verbose("ASSET", "Starting HTTP process");
102 BaseHttpServer httpServer = new BaseHttpServer(m_config.HttpPort); 100 BaseHttpServer httpServer = new BaseHttpServer(m_config.HttpPort);
103 101
104 m_stats = new AssetStatsReporter(); 102 StatsManager.StartCollectingAssetStats();
105 103
106 httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider, m_stats)); 104 httpServer.AddStreamHandler(new GetAssetStreamHandler(this, m_assetProvider));
107 httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider)); 105 httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider));
108 106
109 httpServer.Start(); 107 httpServer.Start();
@@ -184,7 +182,7 @@ namespace OpenSim.Grid.AssetServer
184 break; 182 break;
185 183
186 case "stats": 184 case "stats":
187 m_console.Notice("STATS", Environment.NewLine + m_stats.Report()); 185 m_console.Notice("STATS", Environment.NewLine + StatsManager.AssetStats.Report());
188 break; 186 break;
189 187
190 case "shutdown": 188 case "shutdown":
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index 9b288a7..5c497b6 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -43,22 +43,18 @@ namespace OpenSim.Grid.AssetServer
43 { 43 {
44 private OpenAsset_Main m_assetManager; 44 private OpenAsset_Main m_assetManager;
45 private IAssetProvider m_assetProvider; 45 private IAssetProvider m_assetProvider;
46 private AssetStatsReporter m_stats;
47 46
48 /// <summary> 47 /// <summary>
49 /// Constructor. 48 /// Constructor.
50 /// </summary> 49 /// </summary>
51 /// <param name="assetManager"></param> 50 /// <param name="assetManager"></param>
52 /// <param name="assetProvider"></param> 51 /// <param name="assetProvider"></param>
53 /// <param name="stats">Can be null if stats collection isn't required</param> 52 public GetAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider)
54 public GetAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider,
55 AssetStatsReporter stats)
56 : base("GET", "/assets") 53 : base("GET", "/assets")
57 { 54 {
58 MainLog.Instance.Verbose("REST", "In Get Request"); 55 MainLog.Instance.Verbose("REST", "In Get Request");
59 m_assetManager = assetManager; 56 m_assetManager = assetManager;
60 m_assetProvider = assetProvider; 57 m_assetProvider = assetProvider;
61 m_stats = stats;
62 } 58 }
63 59
64 public override byte[] Handle(string path, Stream request) 60 public override byte[] Handle(string path, Stream request)
@@ -80,8 +76,8 @@ namespace OpenSim.Grid.AssetServer
80 return result; 76 return result;
81 } 77 }
82 78
83 if (m_stats != null) 79 if (StatsManager.AssetStats != null)
84 m_stats.AddRequest(); 80 StatsManager.AssetStats.AddRequest();
85 81
86 AssetBase asset = m_assetProvider.FetchAsset(assetID); 82 AssetBase asset = m_assetProvider.FetchAsset(assetID);
87 if (asset != null) 83 if (asset != null)
@@ -107,8 +103,8 @@ namespace OpenSim.Grid.AssetServer
107 } 103 }
108 else 104 else
109 { 105 {
110 if (m_stats != null) 106 if (StatsManager.AssetStats != null)
111 m_stats.AddNotFoundRequest(); 107 StatsManager.AssetStats.AddNotFoundRequest();
112 108
113 MainLog.Instance.Verbose("REST", "GET:/asset failed to find {0}", assetID); 109 MainLog.Instance.Verbose("REST", "GET:/asset failed to find {0}", assetID);
114 } 110 }
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 2650694..20828ba 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -46,9 +46,7 @@ namespace OpenSim.Grid.UserServer
46 46
47 public UserManager m_userManager; 47 public UserManager m_userManager;
48 public UserLoginService m_loginService; 48 public UserLoginService m_loginService;
49 public MessageServersConnector m_messagesService; 49 public MessageServersConnector m_messagesService;
50
51 protected UserStatsReporter m_stats;
52 50
53 private LogBase m_console; 51 private LogBase m_console;
54 private LLUUID m_lastCreatedUser = LLUUID.Random(); 52 private LLUUID m_lastCreatedUser = LLUUID.Random();
@@ -89,15 +87,15 @@ namespace OpenSim.Grid.UserServer
89 { 87 {
90 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); 88 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
91 89
92 m_stats = new UserStatsReporter(); 90 StatsManager.StartCollectingUserStats();
93 91
94 MainLog.Instance.Verbose("REGION", "Establishing data connection"); 92 MainLog.Instance.Verbose("REGION", "Establishing data connection");
95 m_userManager = new UserManager(m_stats); 93 m_userManager = new UserManager();
96 m_userManager._config = Cfg; 94 m_userManager._config = Cfg;
97 m_userManager.AddPlugin(Cfg.DatabaseProvider); 95 m_userManager.AddPlugin(Cfg.DatabaseProvider);
98 96
99 m_loginService = new UserLoginService( 97 m_loginService = new UserLoginService(
100 m_userManager, new LibraryRootFolder(), m_stats, Cfg, Cfg.DefaultStartupMsg); 98 m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
101 99
102 m_messagesService = new MessageServersConnector(MainLog.Instance); 100 m_messagesService = new MessageServersConnector(MainLog.Instance);
103 101
@@ -199,7 +197,7 @@ namespace OpenSim.Grid.UserServer
199 break; 197 break;
200 198
201 case "stats": 199 case "stats":
202 MainLog.Instance.Notice("STATS", Environment.NewLine + m_stats.Report()); 200 MainLog.Instance.Notice("STATS", Environment.NewLine + StatsManager.UserStats.Report());
203 break; 201 break;
204 202
205 case "test-inventory": 203 case "test-inventory":
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 0f02ad2..10f9468 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -55,8 +55,8 @@ namespace OpenSim.Grid.UserServer
55 55
56 public UserLoginService( 56 public UserLoginService(
57 UserManagerBase userManager, LibraryRootFolder libraryRootFolder, 57 UserManagerBase userManager, LibraryRootFolder libraryRootFolder,
58 UserStatsReporter statsCollector, UserConfig config, string welcomeMess) 58 UserConfig config, string welcomeMess)
59 : base(userManager, libraryRootFolder, statsCollector, welcomeMess) 59 : base(userManager, libraryRootFolder, welcomeMess)
60 { 60 {
61 m_config = config; 61 m_config = config;
62 } 62 }
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 778aec1..c36de7f 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -38,16 +38,7 @@ using OpenSim.Framework.UserManagement;
38namespace OpenSim.Grid.UserServer 38namespace OpenSim.Grid.UserServer
39{ 39{
40 public class UserManager : UserManagerBase 40 public class UserManager : UserManagerBase
41 { 41 {
42 /// <summary>
43 /// Constructor.
44 /// </summary>
45 /// <param name="statsCollector">Can be null if stats collection is not required.
46 /// </param>
47 public UserManager(UserStatsReporter statsCollector) : base(statsCollector)
48 {
49 }
50
51 /// <summary> 42 /// <summary>
52 /// Deletes an active agent session 43 /// Deletes an active agent session
53 /// </summary> 44 /// </summary>
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 1754f7e..da4cf3e 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -304,7 +304,7 @@ namespace OpenSim
304 m_log = CreateLog(); 304 m_log = CreateLog();
305 MainLog.Instance = m_log; 305 MainLog.Instance = m_log;
306 306
307 StatsManager.StartCollecting(); 307 StatsManager.StartCollectingSimExtraStats();
308 308
309 // Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp 309 // Do baseclass startup sequence: OpenSim.Region.ClientStack.RegionApplicationBase.StartUp
310 // TerrainManager, StorageManager, HTTP Server 310 // TerrainManager, StorageManager, HTTP Server
@@ -320,7 +320,7 @@ namespace OpenSim
320 320
321 LocalUserServices userService = 321 LocalUserServices userService =
322 new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, 322 new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX,
323 m_networkServersInfo.DefaultHomeLocY, inventoryService, null); 323 m_networkServersInfo.DefaultHomeLocY, inventoryService);
324 userService.AddPlugin(m_standaloneUserPlugin); 324 userService.AddPlugin(m_standaloneUserPlugin);
325 325
326 LocalBackEndServices backendService = new LocalBackEndServices(); 326 LocalBackEndServices backendService = new LocalBackEndServices();
@@ -333,7 +333,7 @@ namespace OpenSim
333 // TODO No user stats collection yet for standalone 333 // TODO No user stats collection yet for standalone
334 m_loginService = 334 m_loginService =
335 new LocalLoginService(userService, m_standaloneWelcomeMessage, localComms, m_networkServersInfo, 335 new LocalLoginService(userService, m_standaloneWelcomeMessage, localComms, m_networkServersInfo,
336 null, m_standaloneAuthenticate); 336 m_standaloneAuthenticate);
337 m_loginService.OnLoginToRegion += backendService.AddNewSession; 337 m_loginService.OnLoginToRegion += backendService.AddNewSession;
338 338
339 // XMLRPC action 339 // XMLRPC action
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 7dee2cb..2848b8a 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -55,8 +55,8 @@ namespace OpenSim.Region.Communications.Local
55 55
56 public LocalLoginService(UserManagerBase userManager, string welcomeMess, 56 public LocalLoginService(UserManagerBase userManager, string welcomeMess,
57 CommunicationsLocal parent, NetworkServersInfo serversInfo, 57 CommunicationsLocal parent, NetworkServersInfo serversInfo,
58 UserStatsReporter statsCollector, bool authenticate) 58 bool authenticate)
59 : base(userManager, parent.UserProfileCacheService.libraryRoot, statsCollector, welcomeMess) 59 : base(userManager, parent.UserProfileCacheService.libraryRoot, welcomeMess)
60 { 60 {
61 m_Parent = parent; 61 m_Parent = parent;
62 this.serversInfo = serversInfo; 62 this.serversInfo = serversInfo;
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 8a4d4e7..6192a7a 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -52,8 +52,7 @@ namespace OpenSim.Region.Communications.Local
52 /// <param name="inventoryService"></param> 52 /// <param name="inventoryService"></param>
53 /// <param name="statsCollector">Can be null if stats collection is not required.</param> 53 /// <param name="statsCollector">Can be null if stats collection is not required.</param>
54 public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY, 54 public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY,
55 IInventoryServices inventoryService, UserStatsReporter statsCollector) 55 IInventoryServices inventoryService)
56 : base(statsCollector)
57 { 56 {
58 m_serversInfo = serversInfo; 57 m_serversInfo = serversInfo;
59 58
@@ -103,4 +102,4 @@ namespace OpenSim.Region.Communications.Local
103 return data; 102 return data;
104 } 103 }
105 } 104 }
106} \ No newline at end of file 105}
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index ff29b11..6c18540 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -77,7 +77,7 @@ namespace SimpleApp
77 77
78 LocalUserServices userService = 78 LocalUserServices userService =
79 new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, 79 new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX,
80 m_networkServersInfo.DefaultHomeLocY, inventoryService, null); 80 m_networkServersInfo.DefaultHomeLocY, inventoryService);
81 userService.AddPlugin(m_userPlugin); 81 userService.AddPlugin(m_userPlugin);
82 82
83 LocalBackEndServices backendService = new LocalBackEndServices(); 83 LocalBackEndServices backendService = new LocalBackEndServices();
@@ -89,7 +89,7 @@ namespace SimpleApp
89 89
90 LocalLoginService loginService = 90 LocalLoginService loginService =
91 new LocalLoginService( 91 new LocalLoginService(
92 userService, String.Empty, localComms, m_networkServersInfo, null, false); 92 userService, String.Empty, localComms, m_networkServersInfo, false);
93 loginService.OnLoginToRegion += backendService.AddNewSession; 93 loginService.OnLoginToRegion += backendService.AddNewSession;
94 94
95 m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod); 95 m_httpServer.AddXmlRPCHandler("login_to_simulator", loginService.XmlRpcLoginMethod);