OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Comment out unused variables / private fields to avoid compiler warnings.

0.6.6-post-fixes
Jeff Ames 2009-06-04 03:58:04 +00:00
parent 2a855a6457
commit c6cef4bad5
8 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Grid/UserServer.Modules/AvatarCreationModule.cs
View File

@ -49,14 +49,14 @@ namespace OpenSim.Grid.UserServer.Modules
private UserDataBaseService m_userDataBaseService; private UserDataBaseService m_userDataBaseService;
// private BaseHttpServer m_httpServer; // private BaseHttpServer m_httpServer;
private UserConfig m_config; // TODO: unused: private UserConfig m_config;
private string m_inventoryServerUrl; private string m_inventoryServerUrl;
private IInterServiceInventoryServices m_inventoryService; private IInterServiceInventoryServices m_inventoryService;
public AvatarCreationModule(UserDataBaseService userDataBaseService, UserConfig config, IInterServiceInventoryServices inventoryService) public AvatarCreationModule(UserDataBaseService userDataBaseService, UserConfig config, IInterServiceInventoryServices inventoryService)
{ {
m_config = config; // TODO: unused: m_config = config;
m_userDataBaseService = userDataBaseService; m_userDataBaseService = userDataBaseService;
m_inventoryService = inventoryService; m_inventoryService = inventoryService;
m_inventoryServerUrl = config.InventoryUrl.OriginalString; m_inventoryServerUrl = config.InventoryUrl.OriginalString;
@ -124,8 +124,8 @@ namespace OpenSim.Grid.UserServer.Modules
public bool CloneAvatar(Guid avatarID, Guid templateID, bool modifyPermissions, bool removeTargetsClothes) public bool CloneAvatar(Guid avatarID, Guid templateID, bool modifyPermissions, bool removeTargetsClothes)
{ {
m_log.InfoFormat("[AvatarAppearance] Starting to clone avatar {0} inventory to avatar {1}", templateID.ToString(), avatarID.ToString()); m_log.InfoFormat("[AvatarAppearance] Starting to clone avatar {0} inventory to avatar {1}", templateID.ToString(), avatarID.ToString());
Guid bodyFolder = Guid.Empty; // TODO: unused: Guid bodyFolder = Guid.Empty;
Guid clothesFolder = Guid.Empty; // TODO: unused: Guid clothesFolder = Guid.Empty;
bool success = false; bool success = false;
UUID avID = new UUID(avatarID); UUID avID = new UUID(avatarID);

2
OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
View File

@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
{ {
public class DynamicTextureModule : IRegionModule, IDynamicTextureManager public class DynamicTextureModule : IRegionModule, IDynamicTextureManager
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private const int ALL_SIDES = -1; private const int ALL_SIDES = -1;

6
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -320,9 +320,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
private void IRC_ProcessUser(string message) private void IRC_ProcessUser(string message)
{ {
string[] userArgs = ExtractParameters(message); string[] userArgs = ExtractParameters(message);
string username = userArgs[0]; // TODO: unused: string username = userArgs[0];
string hostname = userArgs[1]; // TODO: unused: string hostname = userArgs[1];
string servername = userArgs[2]; // TODO: unused: string servername = userArgs[2];
string realname = userArgs[3].Replace(":", ""); string realname = userArgs[3].Replace(":", "");
m_username = realname; m_username = realname;

2
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCServer.cs
View File

@ -44,8 +44,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
/// </summary> /// </summary>
class IRCServer class IRCServer
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public event OnNewIRCUserDelegate OnNewIRCClient; public event OnNewIRCUserDelegate OnNewIRCClient;
private readonly TcpListener m_listener; private readonly TcpListener m_listener;

7
OpenSim/Server/Handlers/Authentication/AuthenticationServerConnector.cs
View File

@ -36,7 +36,7 @@ namespace OpenSim.Server.Handlers.Authentication
{ {
public class AuthenticationServiceConnector : ServiceConnector public class AuthenticationServiceConnector : ServiceConnector
{ {
private IAuthenticationService m_AuthenticationService; //private IAuthenticationService m_AuthenticationService;
public AuthenticationServiceConnector(IConfigSource config, IHttpServer server) : public AuthenticationServiceConnector(IConfigSource config, IHttpServer server) :
base(config, server) base(config, server)
@ -51,9 +51,8 @@ namespace OpenSim.Server.Handlers.Authentication
if (authenticationService == String.Empty) if (authenticationService == String.Empty)
throw new Exception("No AuthenticationService in config file"); throw new Exception("No AuthenticationService in config file");
Object[] args = new Object[] { config }; //Object[] args = new Object[] { config };
m_AuthenticationService = //m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
//server.AddStreamHandler(new AuthenticationServerGetHandler(m_AuthenticationService)); //server.AddStreamHandler(new AuthenticationServerGetHandler(m_AuthenticationService));
} }

30
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
View File

@ -46,14 +46,14 @@ namespace OpenSim.Server.Handlers.Simulation
{ {
public class AgentGetHandler : BaseStreamHandler public class AgentGetHandler : BaseStreamHandler
{ {
private ISimulationService m_SimulationService; // TODO: unused: private ISimulationService m_SimulationService;
private IAuthenticationService m_AuthenticationService; // TODO: unused: private IAuthenticationService m_AuthenticationService;
public AgentGetHandler(ISimulationService service, IAuthenticationService authentication) : public AgentGetHandler(ISimulationService service, IAuthenticationService authentication) :
base("GET", "/agent") base("GET", "/agent")
{ {
m_SimulationService = service; // TODO: unused: m_SimulationService = service;
m_AuthenticationService = authentication; // TODO: unused: m_AuthenticationService = authentication;
} }
public override byte[] Handle(string path, Stream request, public override byte[] Handle(string path, Stream request,
@ -70,14 +70,14 @@ namespace OpenSim.Server.Handlers.Simulation
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private ISimulationService m_SimulationService; private ISimulationService m_SimulationService;
private IAuthenticationService m_AuthenticationService; private IAuthenticationService m_AuthenticationService;
private bool m_AllowForeignGuests; // TODO: unused: private bool m_AllowForeignGuests;
public AgentPostHandler(ISimulationService service, IAuthenticationService authentication, bool foreignGuests) : public AgentPostHandler(ISimulationService service, IAuthenticationService authentication, bool foreignGuests) :
base("POST", "/agent") base("POST", "/agent")
{ {
m_SimulationService = service; m_SimulationService = service;
m_AuthenticationService = authentication; m_AuthenticationService = authentication;
m_AllowForeignGuests = foreignGuests; // TODO: unused: m_AllowForeignGuests = foreignGuests;
} }
public override byte[] Handle(string path, Stream request, public override byte[] Handle(string path, Stream request,
@ -160,20 +160,19 @@ namespace OpenSim.Server.Handlers.Simulation
httpResponse.StatusCode = (int)HttpStatusCode.OK; httpResponse.StatusCode = (int)HttpStatusCode.OK;
return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp)); return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(resp));
} }
} }
public class AgentPutHandler : BaseStreamHandler public class AgentPutHandler : BaseStreamHandler
{ {
private ISimulationService m_SimulationService; // TODO: unused: private ISimulationService m_SimulationService;
private IAuthenticationService m_AuthenticationService; // TODO: unused: private IAuthenticationService m_AuthenticationService;
public AgentPutHandler(ISimulationService service, IAuthenticationService authentication) : public AgentPutHandler(ISimulationService service, IAuthenticationService authentication) :
base("PUT", "/agent") base("PUT", "/agent")
{ {
m_SimulationService = service; // TODO: unused: m_SimulationService = service;
m_AuthenticationService = authentication; // TODO: unused: m_AuthenticationService = authentication;
} }
public override byte[] Handle(string path, Stream request, public override byte[] Handle(string path, Stream request,
@ -187,14 +186,14 @@ namespace OpenSim.Server.Handlers.Simulation
public class AgentDeleteHandler : BaseStreamHandler public class AgentDeleteHandler : BaseStreamHandler
{ {
private ISimulationService m_SimulationService; // TODO: unused: private ISimulationService m_SimulationService;
private IAuthenticationService m_AuthenticationService; // TODO: unused: private IAuthenticationService m_AuthenticationService;
public AgentDeleteHandler(ISimulationService service, IAuthenticationService authentication) : public AgentDeleteHandler(ISimulationService service, IAuthenticationService authentication) :
base("DELETE", "/agent") base("DELETE", "/agent")
{ {
m_SimulationService = service; // TODO: unused: m_SimulationService = service;
m_AuthenticationService = authentication; // TODO: unused: m_AuthenticationService = authentication;
} }
public override byte[] Handle(string path, Stream request, public override byte[] Handle(string path, Stream request,
@ -205,5 +204,4 @@ namespace OpenSim.Server.Handlers.Simulation
return new byte[] { }; return new byte[] { };
} }
} }
} }

12
OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs
View File

@ -46,7 +46,7 @@ namespace OpenSim.Server.Handlers.Tests.Asset
{ {
TestHelper.InMethod(); TestHelper.InMethod();
AssetServerGetHandler handler = new AssetServerGetHandler( null ); AssetServerGetHandler handler = new AssetServerGetHandler(null);
} }
[Test] [Test]
@ -54,7 +54,7 @@ namespace OpenSim.Server.Handlers.Tests.Asset
{ {
TestHelper.InMethod(); TestHelper.InMethod();
AssetServerGetHandler handler = new AssetServerGetHandler(null); AssetServerGetHandler handler = new AssetServerGetHandler(null);
BaseRequestHandlerTestHelper.BaseTestGetParams(handler, ASSETS_PATH); BaseRequestHandlerTestHelper.BaseTestGetParams(handler, ASSETS_PATH);
} }
@ -63,18 +63,18 @@ namespace OpenSim.Server.Handlers.Tests.Asset
{ {
TestHelper.InMethod(); TestHelper.InMethod();
AssetServerGetHandler handler = new AssetServerGetHandler(null); AssetServerGetHandler handler = new AssetServerGetHandler(null);
BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH); BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH);
} }
// TODO: unused // TODO: unused
// private static AssetBase CreateTestEnvironment(out AssetServerGetHandler handler, out OSHttpResponse response) // private static AssetBase CreateTestEnvironment(out AssetServerGetHandler handler, out OSHttpResponse response)
// { // {
// AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response); // AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response);
// IAssetService assetDataPlugin = new TestAssetService(); // IAssetService assetDataPlugin = new TestAssetService();
// handler = new AssetServerGetHandler(assetDataPlugin); // handler = new AssetServerGetHandler(assetDataPlugin);
// assetDataPlugin.Store(asset); // assetDataPlugin.Store(asset);
// return asset; // return asset;
// } // }
} }
} }

4
OpenSim/Services/AuthenticationService/AuthenticationService.cs
View File

@ -39,10 +39,6 @@ namespace OpenSim.Services.AuthenticationService
{ {
public class AuthenticationService : ServiceBase, IAuthenticationService public class AuthenticationService : ServiceBase, IAuthenticationService
{ {
private static readonly ILog m_log =
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
public AuthenticationService(IConfigSource config) : base(config) public AuthenticationService(IConfigSource config) : base(config)
{ {
} }