aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-28 15:40:44 +0000
committerJustin Clarke Casey2008-11-28 15:40:44 +0000
commit7b49c711e93632276ee0f01a97ad67e9988f773a (patch)
tree085d349798fb3c4c8a42b2ae7d5bc0d48edefc41
parent* refactor: move CreateUser into UserServiceAdmin (diff)
downloadopensim-SC_OLD-7b49c711e93632276ee0f01a97ad67e9988f773a.zip
opensim-SC_OLD-7b49c711e93632276ee0f01a97ad67e9988f773a.tar.gz
opensim-SC_OLD-7b49c711e93632276ee0f01a97ad67e9988f773a.tar.bz2
opensim-SC_OLD-7b49c711e93632276ee0f01a97ad67e9988f773a.tar.xz
* minor: Eliminate unused paramter in LocalUserServices constructors
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs4
-rw-r--r--OpenSim/Region/Application/HGOpenSimNode.cs4
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs4
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs2
5 files changed, 9 insertions, 13 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 2308910..a0c96b2 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -72,12 +72,12 @@ namespace OpenSim.Grid.UserServer
72 public void setloginlevel(int level) 72 public void setloginlevel(int level)
73 { 73 {
74 m_minLoginLevel = level; 74 m_minLoginLevel = level;
75 m_log.InfoFormat("[GRID] Login Level set to {0} ", level); 75 m_log.InfoFormat("[GRID]: Login Level set to {0} ", level);
76 } 76 }
77 public void setwelcometext(string text) 77 public void setwelcometext(string text)
78 { 78 {
79 m_welcomeMessage = text; 79 m_welcomeMessage = text;
80 m_log.InfoFormat("[GRID] Login text set to {0} ", text); 80 m_log.InfoFormat("[GRID]: Login text set to {0} ", text);
81 } 81 }
82 82
83 public override void LogOffUser(UserProfileData theUser, string message) 83 public override void LogOffUser(UserProfileData theUser, string message)
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs
index 7605bae..8f6fd5e 100644
--- a/OpenSim/Region/Application/HGOpenSimNode.cs
+++ b/OpenSim/Region/Application/HGOpenSimNode.cs
@@ -82,8 +82,8 @@ namespace OpenSim
82 inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource); 82 inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource);
83 83
84 LocalUserServices userService = 84 LocalUserServices userService =
85 new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, 85 new LocalUserServices(
86 m_networkServersInfo.DefaultHomeLocY, inventoryService); 86 m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService);
87 userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource); 87 userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource);
88 88
89 //LocalBackEndServices backendService = new LocalBackEndServices(); 89 //LocalBackEndServices backendService = new LocalBackEndServices();
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 7ccb3d4..f7ffa00 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -210,8 +210,8 @@ namespace OpenSim
210 inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource); 210 inventoryService.AddPlugin(m_configSettings.StandaloneInventoryPlugin, m_configSettings.StandaloneInventorySource);
211 211
212 LocalUserServices userService = 212 LocalUserServices userService =
213 new LocalUserServices(m_networkServersInfo, m_networkServersInfo.DefaultHomeLocX, 213 new LocalUserServices(
214 m_networkServersInfo.DefaultHomeLocY, inventoryService); 214 m_networkServersInfo.DefaultHomeLocX, m_networkServersInfo.DefaultHomeLocY, inventoryService);
215 userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource); 215 userService.AddPlugin(m_configSettings.StandaloneUserPlugin, m_configSettings.StandaloneUserSource);
216 216
217 LocalBackEndServices backendService = new LocalBackEndServices(); 217 LocalBackEndServices backendService = new LocalBackEndServices();
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index e0c9c83..f4fe686 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -40,17 +40,13 @@ namespace OpenSim.Region.Communications.Local
40 /// <summary> 40 /// <summary>
41 /// User services used when OpenSim is running in standalone mode. 41 /// User services used when OpenSim is running in standalone mode.
42 /// </summary> 42 /// </summary>
43 /// <param name="serversInfo"></param>
44 /// <param name="defaultHomeLocX"></param> 43 /// <param name="defaultHomeLocX"></param>
45 /// <param name="defaultHomeLocY"></param> 44 /// <param name="defaultHomeLocY"></param>
46 /// <param name="inventoryService"></param> 45 /// <param name="inventoryService"></param>
47 /// <param name="statsCollector">Can be null if stats collection is not required.</param> 46 public LocalUserServices(
48 public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY, 47 uint defaultHomeLocX, uint defaultHomeLocY, IInterServiceInventoryServices interServiceInventoryService)
49 IInterServiceInventoryServices interServiceInventoryService)
50 : base(interServiceInventoryService) 48 : base(interServiceInventoryService)
51 { 49 {
52 // m_serversInfo = serversInfo;
53
54 m_defaultHomeX = defaultHomeLocX; 50 m_defaultHomeX = defaultHomeLocX;
55 m_defaultHomeY = defaultHomeLocY; 51 m_defaultHomeY = defaultHomeLocY;
56 } 52 }
diff --git a/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs b/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs
index b9804d9..1607e03 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
42 m_interServiceInventoryService = lis; 42 m_interServiceInventoryService = lis;
43 AddInventoryService(lis); 43 AddInventoryService(lis);
44 44
45 LocalUserServices lus = new LocalUserServices(null, 991, 992, lis); 45 LocalUserServices lus = new LocalUserServices(991, 992, lis);
46 m_userService = lus; 46 m_userService = lus;
47 m_userServiceAdmin = lus; 47 m_userServiceAdmin = lus;
48 } 48 }