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

minor: remove some mono compiler warnings

remotes/origin/0.6.7-post-fixes
Justin Clark-Casey (justincc) 2009-09-25 14:31:29 +01:00
parent ad753d784c
commit 730458be1f
6 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
View File

@ -200,11 +200,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
if (m_RequestMap.ContainsKey(request)) if (m_RequestMap.ContainsKey(request))
{ {
UrlData urlData = m_RequestMap[request]; UrlData urlData = m_RequestMap[request];
RequestData requestData=urlData.requests[request];
urlData.requests[request].responseCode = status; urlData.requests[request].responseCode = status;
urlData.requests[request].responseBody = body; urlData.requests[request].responseBody = body;
//urlData.requests[request].ev.Set(); //urlData.requests[request].ev.Set();
urlData.requests[request].requestDone=true; urlData.requests[request].requestDone =true;
} }
else else
{ {
@ -397,7 +396,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
{ {
Hashtable headers = (Hashtable)request["headers"]; Hashtable headers = (Hashtable)request["headers"];
string uri_full = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri;// "/lslhttp/" + urlcode.ToString() + "/"; // string uri_full = "http://" + m_ExternalHostNameForLSL + ":" + m_HttpServer.Port.ToString() + uri;// "/lslhttp/" + urlcode.ToString() + "/";
int pos1 = uri.IndexOf("/");// /lslhttp int pos1 = uri.IndexOf("/");// /lslhttp
int pos2 = uri.IndexOf("/", pos1 + 1);// /lslhttp/ int pos2 = uri.IndexOf("/", pos1 + 1);// /lslhttp/
@ -471,7 +470,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
url.engine.PostScriptEvent(url.itemID, "http_request", new Object[] { requestID.ToString(), request["http-method"].ToString(), request["body"].ToString() }); url.engine.PostScriptEvent(url.itemID, "http_request", new Object[] { requestID.ToString(), request["http-method"].ToString(), request["body"].ToString() });
//send initial response? //send initial response?
Hashtable response = new Hashtable(); // Hashtable response = new Hashtable();
return; return;

17
OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
View File

@ -47,8 +47,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// This maps between inventory server urls and inventory server clients // This maps between inventory server urls and inventory server clients
private Dictionary<string, InventoryClient> m_inventoryServers = new Dictionary<string, InventoryClient>(); // private Dictionary<string, InventoryClient> m_inventoryServers = new Dictionary<string, InventoryClient>();
private Scene m_scene; private Scene m_scene;
#endregion #endregion
@ -72,13 +71,13 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
return null; return null;
} }
private string UserInventoryURL(UUID userID) // private string UserInventoryURL(UUID userID)
{ // {
CachedUserInfo uinfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(userID); // CachedUserInfo uinfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
if (uinfo != null) // if (uinfo != null)
return (uinfo.UserProfile.UserInventoryURI == "") ? null : uinfo.UserProfile.UserInventoryURI; // return (uinfo.UserProfile.UserInventoryURI == "") ? null : uinfo.UserProfile.UserInventoryURI;
return null; // return null;
} // }
private bool IsLocalUser(UUID userID) private bool IsLocalUser(UUID userID)
{ {

2
OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs
View File

@ -44,7 +44,7 @@ namespace OpenSim.Server.Handlers.Authorization
{ {
public class AuthorizationServerPostHandler : BaseStreamHandler public class AuthorizationServerPostHandler : BaseStreamHandler
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IAuthorizationService m_AuthorizationService; private IAuthorizationService m_AuthorizationService;

6
OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
View File

@ -43,9 +43,9 @@ namespace OpenSim.Services.AuthenticationService
// //
public class AuthenticationServiceBase : ServiceBase public class AuthenticationServiceBase : ServiceBase
{ {
private static readonly ILog m_log = // private static readonly ILog m_log =
LogManager.GetLogger( // LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType); // MethodBase.GetCurrentMethod().DeclaringType);
protected IAuthenticationData m_Database; protected IAuthenticationData m_Database;

6
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
View File

@ -47,9 +47,9 @@ namespace OpenSim.Services.AuthenticationService
public class PasswordAuthenticationService : public class PasswordAuthenticationService :
AuthenticationServiceBase, IAuthenticationService AuthenticationServiceBase, IAuthenticationService
{ {
private static readonly ILog m_log = // private static readonly ILog m_log =
LogManager.GetLogger( // LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType); // MethodBase.GetCurrentMethod().DeclaringType);
public PasswordAuthenticationService(IConfigSource config) : public PasswordAuthenticationService(IConfigSource config) :
base(config) base(config)

6
OpenSim/Services/AuthenticationService/WebkeyAuthenticationService.cs
View File

@ -43,9 +43,9 @@ namespace OpenSim.Services.AuthenticationService
public class WebkeyAuthenticationService : public class WebkeyAuthenticationService :
AuthenticationServiceBase, IAuthenticationService AuthenticationServiceBase, IAuthenticationService
{ {
private static readonly ILog m_log = // private static readonly ILog m_log =
LogManager.GetLogger( // LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType); // MethodBase.GetCurrentMethod().DeclaringType);
public WebkeyAuthenticationService(IConfigSource config) : public WebkeyAuthenticationService(IConfigSource config) :
base(config) base(config)