aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs8
-rw-r--r--OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs6
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs2
-rw-r--r--OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs7
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs30
-rw-r--r--OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs12
-rw-r--r--OpenSim/Services/AuthenticationService/AuthenticationService.cs4
8 files changed, 31 insertions, 40 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs b/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs
index 6077298..c443203 100644
--- a/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs
+++ b/OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs
@@ -49,14 +49,14 @@ namespace OpenSim.Grid.UserServer.Modules
49 49
50 private UserDataBaseService m_userDataBaseService; 50 private UserDataBaseService m_userDataBaseService;
51 // private BaseHttpServer m_httpServer; 51 // private BaseHttpServer m_httpServer;
52 private UserConfig m_config; 52 // TODO: unused: private UserConfig m_config;
53 53
54 private string m_inventoryServerUrl; 54 private string m_inventoryServerUrl;
55 private IInterServiceInventoryServices m_inventoryService; 55 private IInterServiceInventoryServices m_inventoryService;
56 56
57 public AvatarCreationModule(UserDataBaseService userDataBaseService, UserConfig config, IInterServiceInventoryServices inventoryService) 57 public AvatarCreationModule(UserDataBaseService userDataBaseService, UserConfig config, IInterServiceInventoryServices inventoryService)
58 { 58 {
59 m_config = config; 59 // TODO: unused: m_config = config;
60 m_userDataBaseService = userDataBaseService; 60 m_userDataBaseService = userDataBaseService;
61 m_inventoryService = inventoryService; 61 m_inventoryService = inventoryService;
62 m_inventoryServerUrl = config.InventoryUrl.OriginalString; 62 m_inventoryServerUrl = config.InventoryUrl.OriginalString;
@@ -124,8 +124,8 @@ namespace OpenSim.Grid.UserServer.Modules
124 public bool CloneAvatar(Guid avatarID, Guid templateID, bool modifyPermissions, bool removeTargetsClothes) 124 public bool CloneAvatar(Guid avatarID, Guid templateID, bool modifyPermissions, bool removeTargetsClothes)
125 { 125 {
126 m_log.InfoFormat("[AvatarAppearance] Starting to clone avatar {0} inventory to avatar {1}", templateID.ToString(), avatarID.ToString()); 126 m_log.InfoFormat("[AvatarAppearance] Starting to clone avatar {0} inventory to avatar {1}", templateID.ToString(), avatarID.ToString());
127 Guid bodyFolder = Guid.Empty; 127 // TODO: unused: Guid bodyFolder = Guid.Empty;
128 Guid clothesFolder = Guid.Empty; 128 // TODO: unused: Guid clothesFolder = Guid.Empty;
129 bool success = false; 129 bool success = false;
130 130
131 UUID avID = new UUID(avatarID); 131 UUID avID = new UUID(avatarID);
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 366751b..2d9143a 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
42{ 42{
43 public class DynamicTextureModule : IRegionModule, IDynamicTextureManager 43 public class DynamicTextureModule : IRegionModule, IDynamicTextureManager
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 private const int ALL_SIDES = -1; 47 private const int ALL_SIDES = -1;
48 48
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index daadb87..9c6c44d 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -320,9 +320,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
320 private void IRC_ProcessUser(string message) 320 private void IRC_ProcessUser(string message)
321 { 321 {
322 string[] userArgs = ExtractParameters(message); 322 string[] userArgs = ExtractParameters(message);
323 string username = userArgs[0]; 323 // TODO: unused: string username = userArgs[0];
324 string hostname = userArgs[1]; 324 // TODO: unused: string hostname = userArgs[1];
325 string servername = userArgs[2]; 325 // TODO: unused: string servername = userArgs[2];
326 string realname = userArgs[3].Replace(":", ""); 326 string realname = userArgs[3].Replace(":", "");
327 327
328 m_username = realname; 328 m_username = realname;
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs
index 43a28a2..91ce9f1 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs
@@ -44,8 +44,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
44 /// </summary> 44 /// </summary>
45 class IRCServer 45 class IRCServer
46 { 46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48
49 public event OnNewIRCUserDelegate OnNewIRCClient; 47 public event OnNewIRCUserDelegate OnNewIRCClient;
50 48
51 private readonly TcpListener m_listener; 49 private readonly TcpListener m_listener;
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs
index 07dea4a..c3c2f69 100644
--- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs
+++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Server.Handlers.Authentication
36{ 36{
37 public class AuthenticationServiceConnector : ServiceConnector 37 public class AuthenticationServiceConnector : ServiceConnector
38 { 38 {
39 private IAuthenticationService m_AuthenticationService; 39 //private IAuthenticationService m_AuthenticationService;
40 40
41 public AuthenticationServiceConnector(IConfigSource config, IHttpServer server) : 41 public AuthenticationServiceConnector(IConfigSource config, IHttpServer server) :
42 base(config, server) 42 base(config, server)
@@ -51,9 +51,8 @@ namespace OpenSim.Server.Handlers.Authentication
51 if (authenticationService == String.Empty) 51 if (authenticationService == String.Empty)
52 throw new Exception("No AuthenticationService in config file"); 52 throw new Exception("No AuthenticationService in config file");
53 53
54 Object[] args = new Object[] { config }; 54 //Object[] args = new Object[] { config };
55 m_AuthenticationService = 55 //m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
56 ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
57 56
58 //server.AddStreamHandler(new AuthenticationServerGetHandler(m_AuthenticationService)); 57 //server.AddStreamHandler(new AuthenticationServerGetHandler(m_AuthenticationService));
59 } 58 }
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index dd32ec9..c14ad99 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -46,14 +46,14 @@ namespace OpenSim.Server.Handlers.Simulation
46{ 46{
47 public class AgentGetHandler : BaseStreamHandler 47 public class AgentGetHandler : BaseStreamHandler
48 { 48 {
49 private ISimulationService m_SimulationService; 49 // TODO: unused: private ISimulationService m_SimulationService;
50 private IAuthenticationService m_AuthenticationService; 50 // TODO: unused: private IAuthenticationService m_AuthenticationService;
51 51
52 public AgentGetHandler(ISimulationService service, IAuthenticationService authentication) : 52 public AgentGetHandler(ISimulationService service, IAuthenticationService authentication) :
53 base("GET", "/agent") 53 base("GET", "/agent")
54 { 54 {
55 m_SimulationService = service; 55 // TODO: unused: m_SimulationService = service;
56 m_AuthenticationService = authentication; 56 // TODO: unused: m_AuthenticationService = authentication;
57 } 57 }
58 58
59 public override byte[] Handle(string path, Stream request, 59 public override byte[] Handle(string path, Stream request,
@@ -70,14 +70,14 @@ namespace OpenSim.Server.Handlers.Simulation
70 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 70 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
71 private ISimulationService m_SimulationService; 71 private ISimulationService m_SimulationService;
72 private IAuthenticationService m_AuthenticationService; 72 private IAuthenticationService m_AuthenticationService;
73 private bool m_AllowForeignGuests; 73 // TODO: unused: private bool m_AllowForeignGuests;
74 74
75 public AgentPostHandler(ISimulationService service, IAuthenticationService authentication, bool foreignGuests) : 75 public AgentPostHandler(ISimulationService service, IAuthenticationService authentication, bool foreignGuests) :
76 base("POST", "/agent") 76 base("POST", "/agent")
77 { 77 {
78 m_SimulationService = service; 78 m_SimulationService = service;
79 m_AuthenticationService = authentication; 79 m_AuthenticationService = authentication;
80 m_AllowForeignGuests = foreignGuests; 80 // TODO: unused: m_AllowForeignGuests = foreignGuests;
81 } 81 }
82 82
83 public override byte[] Handle(string path, Stream request, 83 public override byte[] Handle(string path, Stream request,
@@ -160,20 +160,19 @@ namespace OpenSim.Server.Handlers.Simulation
160 httpResponse.StatusCode = (int)HttpStatusCode.OK; 160 httpResponse.StatusCode = (int)HttpStatusCode.OK;
161 161
162 return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); 162 return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp));
163
164 } 163 }
165 } 164 }
166 165
167 public class AgentPutHandler : BaseStreamHandler 166 public class AgentPutHandler : BaseStreamHandler
168 { 167 {
169 private ISimulationService m_SimulationService; 168 // TODO: unused: private ISimulationService m_SimulationService;
170 private IAuthenticationService m_AuthenticationService; 169 // TODO: unused: private IAuthenticationService m_AuthenticationService;
171 170
172 public AgentPutHandler(ISimulationService service, IAuthenticationService authentication) : 171 public AgentPutHandler(ISimulationService service, IAuthenticationService authentication) :
173 base("PUT", "/agent") 172 base("PUT", "/agent")
174 { 173 {
175 m_SimulationService = service; 174 // TODO: unused: m_SimulationService = service;
176 m_AuthenticationService = authentication; 175 // TODO: unused: m_AuthenticationService = authentication;
177 } 176 }
178 177
179 public override byte[] Handle(string path, Stream request, 178 public override byte[] Handle(string path, Stream request,
@@ -187,14 +186,14 @@ namespace OpenSim.Server.Handlers.Simulation
187 186
188 public class AgentDeleteHandler : BaseStreamHandler 187 public class AgentDeleteHandler : BaseStreamHandler
189 { 188 {
190 private ISimulationService m_SimulationService; 189 // TODO: unused: private ISimulationService m_SimulationService;
191 private IAuthenticationService m_AuthenticationService; 190 // TODO: unused: private IAuthenticationService m_AuthenticationService;
192 191
193 public AgentDeleteHandler(ISimulationService service, IAuthenticationService authentication) : 192 public AgentDeleteHandler(ISimulationService service, IAuthenticationService authentication) :
194 base("DELETE", "/agent") 193 base("DELETE", "/agent")
195 { 194 {
196 m_SimulationService = service; 195 // TODO: unused: m_SimulationService = service;
197 m_AuthenticationService = authentication; 196 // TODO: unused: m_AuthenticationService = authentication;
198 } 197 }
199 198
200 public override byte[] Handle(string path, Stream request, 199 public override byte[] Handle(string path, Stream request,
@@ -205,5 +204,4 @@ namespace OpenSim.Server.Handlers.Simulation
205 return new byte[] { }; 204 return new byte[] { };
206 } 205 }
207 } 206 }
208
209} 207}
diff --git a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs
index aeca7b9..2615358 100644
--- a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs
+++ b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Server.Handlers.Tests.Asset
46 { 46 {
47 TestHelper.InMethod(); 47 TestHelper.InMethod();
48 48
49 AssetServerGetHandler handler = new AssetServerGetHandler( null ); 49 AssetServerGetHandler handler = new AssetServerGetHandler(null);
50 } 50 }
51 51
52 [Test] 52 [Test]
@@ -54,7 +54,7 @@ namespace OpenSim.Server.Handlers.Tests.Asset
54 { 54 {
55 TestHelper.InMethod(); 55 TestHelper.InMethod();
56 56
57 AssetServerGetHandler handler = new AssetServerGetHandler(null); 57 AssetServerGetHandler handler = new AssetServerGetHandler(null);
58 BaseRequestHandlerTestHelper.BaseTestGetParams(handler, ASSETS_PATH); 58 BaseRequestHandlerTestHelper.BaseTestGetParams(handler, ASSETS_PATH);
59 } 59 }
60 60
@@ -63,18 +63,18 @@ namespace OpenSim.Server.Handlers.Tests.Asset
63 { 63 {
64 TestHelper.InMethod(); 64 TestHelper.InMethod();
65 65
66 AssetServerGetHandler handler = new AssetServerGetHandler(null); 66 AssetServerGetHandler handler = new AssetServerGetHandler(null);
67 BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH); 67 BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH);
68 } 68 }
69 69
70 // TODO: unused 70 // TODO: unused
71 // private static AssetBase CreateTestEnvironment(out AssetServerGetHandler handler, out OSHttpResponse response) 71 // private static AssetBase CreateTestEnvironment(out AssetServerGetHandler handler, out OSHttpResponse response)
72 // { 72 // {
73 // AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response); 73 // AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response);
74 // IAssetService assetDataPlugin = new TestAssetService(); 74 // IAssetService assetDataPlugin = new TestAssetService();
75 // handler = new AssetServerGetHandler(assetDataPlugin); 75 // handler = new AssetServerGetHandler(assetDataPlugin);
76 // assetDataPlugin.Store(asset); 76 // assetDataPlugin.Store(asset);
77 // return asset; 77 // return asset;
78 // } 78 // }
79 } 79 }
80} \ No newline at end of file 80}
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationService.cs b/OpenSim/Services/AuthenticationService/AuthenticationService.cs
index a72236e..3eaa03d 100644
--- a/OpenSim/Services/AuthenticationService/AuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/AuthenticationService.cs
@@ -39,10 +39,6 @@ namespace OpenSim.Services.AuthenticationService
39{ 39{
40 public class AuthenticationService : ServiceBase, IAuthenticationService 40 public class AuthenticationService : ServiceBase, IAuthenticationService
41 { 41 {
42 private static readonly ILog m_log =
43 LogManager.GetLogger(
44 MethodBase.GetCurrentMethod().DeclaringType);
45
46 public AuthenticationService(IConfigSource config) : base(config) 42 public AuthenticationService(IConfigSource config) : base(config)
47 { 43 {
48 } 44 }