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

Eliminated several warnings

0.8.2-post-fixes
Oren Hurvitz 2015-07-31 18:13:39 +03:00
parent 149cb8dcbc
commit 14b4d8bad7
7 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
View File

@ -128,7 +128,9 @@ namespace OpenSim.Capabilities.Handlers
if (invcollSet == null) if (invcollSet == null)
{ {
m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Multiple folder fetch failed. Trying old protocol."); m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Multiple folder fetch failed. Trying old protocol.");
#pragma warning disable 0612
return FetchInventoryDescendentsRequest(foldersrequested, httpRequest, httpResponse); return FetchInventoryDescendentsRequest(foldersrequested, httpRequest, httpResponse);
#pragma warning restore 0612
} }
string inventoryitemstr = string.Empty; string inventoryitemstr = string.Empty;
@ -199,10 +201,11 @@ namespace OpenSim.Capabilities.Handlers
int version = 0; int version = 0;
int descendents = 0; int descendents = 0;
inv #pragma warning disable 0612
= Fetch( inv = Fetch(
invFetch.owner_id, invFetch.folder_id, invFetch.owner_id, invFetch.owner_id, invFetch.folder_id, invFetch.owner_id,
invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version, out descendents); invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version, out descendents);
#pragma warning restore 0612
if (inv != null && inv.Folders != null) if (inv != null && inv.Folders != null)
{ {

2
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
View File

@ -139,10 +139,12 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
return false; return false;
// Check for policy and execute it if defined // Check for policy and execute it if defined
#pragma warning disable 0618
if (ServicePointManager.CertificatePolicy != null) if (ServicePointManager.CertificatePolicy != null)
{ {
return ServicePointManager.CertificatePolicy.CheckValidationResult (sp, certificate, Request, 0); return ServicePointManager.CertificatePolicy.CheckValidationResult (sp, certificate, Request, 0);
} }
#pragma warning restore 0618
return true; return true;
} }

2
OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
View File

@ -96,8 +96,10 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
{ {
public string Response { get; set; } public string Response { get; set; }
#pragma warning disable 0618
public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext) public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext)
: base(serializationInfo, streamingContext) {} : base(serializationInfo, streamingContext) {}
#pragma warning restore 0618
public override Stream GetResponseStream() public override Stream GetResponseStream()
{ {

2
OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
View File

@ -180,6 +180,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
/// * Internet /// * Internet
/// * Everything /// * Everything
/// </remarks> /// </remarks>
#pragma warning disable 0618
public static AppDomain CreateRestrictedDomain(string permissionSetName, string appDomainName) public static AppDomain CreateRestrictedDomain(string permissionSetName, string appDomainName)
{ {
if (permissionSetName == null) if (permissionSetName == null)
@ -240,6 +241,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
return restrictedDomain; return restrictedDomain;
} }
#pragma warning restore 0618
void EventManager_OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource) void EventManager_OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource)

1
OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs
View File

@ -50,7 +50,6 @@ public class HullCreation : OpenSimTestCase
BSScene PhysicsScene { get; set; } BSScene PhysicsScene { get; set; }
Vector3 ObjectInitPosition; Vector3 ObjectInitPosition;
float simulationTimeStep = 0.089f;
[TestFixtureSetUp] [TestFixtureSetUp]
public void Init() public void Init()

2
OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs
View File

@ -44,7 +44,9 @@ namespace OpenSim.Server.Handlers.Hypergrid
public HeloServiceInConnector(IConfigSource config, IHttpServer server, string configName) : public HeloServiceInConnector(IConfigSource config, IHttpServer server, string configName) :
base(config, server, configName) base(config, server, configName)
{ {
#pragma warning disable 0612
server.AddStreamHandler(new HeloServerGetHandler("opensim-robust")); server.AddStreamHandler(new HeloServerGetHandler("opensim-robust"));
#pragma warning restore 0612
server.AddStreamHandler(new HeloServerHeadHandler("opensim-robust")); server.AddStreamHandler(new HeloServerHeadHandler("opensim-robust"));
} }
} }

2
OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
View File

@ -99,8 +99,10 @@ namespace OpenSim.Server.Handlers.Hypergrid
server.AddXmlRPCHandler("verify_client", VerifyClient, false); server.AddXmlRPCHandler("verify_client", VerifyClient, false);
server.AddXmlRPCHandler("logout_agent", LogoutAgent, false); server.AddXmlRPCHandler("logout_agent", LogoutAgent, false);
#pragma warning disable 0612
server.AddXmlRPCHandler("status_notification", StatusNotification, false); server.AddXmlRPCHandler("status_notification", StatusNotification, false);
server.AddXmlRPCHandler("get_online_friends", GetOnlineFriends, false); server.AddXmlRPCHandler("get_online_friends", GetOnlineFriends, false);
#pragma warning restore 0612
server.AddXmlRPCHandler("get_user_info", GetUserInfo, false); server.AddXmlRPCHandler("get_user_info", GetUserInfo, false);
server.AddXmlRPCHandler("get_server_urls", GetServerURLs, false); server.AddXmlRPCHandler("get_server_urls", GetServerURLs, false);