aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorOren Hurvitz2015-07-31 18:13:39 +0300
committerOren Hurvitz2015-07-31 18:13:39 +0300
commit14b4d8bad796527a05a5f5992d1a1df1c5c43e6f (patch)
tree8d8c3bc5b43fc6a9eb720ef9df685baba4de6fac /OpenSim
parentXMLRPCModule now actually aborts the worker thread when requested (diff)
downloadopensim-SC_OLD-14b4d8bad796527a05a5f5992d1a1df1c5c43e6f.zip
opensim-SC_OLD-14b4d8bad796527a05a5f5992d1a1df1c5c43e6f.tar.gz
opensim-SC_OLD-14b4d8bad796527a05a5f5992d1a1df1c5c43e6f.tar.bz2
opensim-SC_OLD-14b4d8bad796527a05a5f5992d1a1df1c5c43e6f.tar.xz
Eliminated several warnings
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs7
-rw-r--r--OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs2
-rw-r--r--OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs2
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs1
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs2
-rw-r--r--OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs2
7 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
index 5c7a3df..7197049 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
@@ -128,7 +128,9 @@ namespace OpenSim.Capabilities.Handlers
128 if (invcollSet == null) 128 if (invcollSet == null)
129 { 129 {
130 m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Multiple folder fetch failed. Trying old protocol."); 130 m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Multiple folder fetch failed. Trying old protocol.");
131#pragma warning disable 0612
131 return FetchInventoryDescendentsRequest(foldersrequested, httpRequest, httpResponse); 132 return FetchInventoryDescendentsRequest(foldersrequested, httpRequest, httpResponse);
133#pragma warning restore 0612
132 } 134 }
133 135
134 string inventoryitemstr = string.Empty; 136 string inventoryitemstr = string.Empty;
@@ -199,10 +201,11 @@ namespace OpenSim.Capabilities.Handlers
199 int version = 0; 201 int version = 0;
200 int descendents = 0; 202 int descendents = 0;
201 203
202 inv 204#pragma warning disable 0612
203 = Fetch( 205 inv = Fetch(
204 invFetch.owner_id, invFetch.folder_id, invFetch.owner_id, 206 invFetch.owner_id, invFetch.folder_id, invFetch.owner_id,
205 invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version, out descendents); 207 invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version, out descendents);
208#pragma warning restore 0612
206 209
207 if (inv != null && inv.Folders != null) 210 if (inv != null && inv.Folders != null)
208 { 211 {
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 8f6aa55..b1f3f9b 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -139,10 +139,12 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
139 return false; 139 return false;
140 140
141 // Check for policy and execute it if defined 141 // Check for policy and execute it if defined
142#pragma warning disable 0618
142 if (ServicePointManager.CertificatePolicy != null) 143 if (ServicePointManager.CertificatePolicy != null)
143 { 144 {
144 return ServicePointManager.CertificatePolicy.CheckValidationResult (sp, certificate, Request, 0); 145 return ServicePointManager.CertificatePolicy.CheckValidationResult (sp, certificate, Request, 0);
145 } 146 }
147#pragma warning restore 0618
146 148
147 return true; 149 return true;
148 } 150 }
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
index 28fd495..d22487e 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
@@ -96,8 +96,10 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
96 { 96 {
97 public string Response { get; set; } 97 public string Response { get; set; }
98 98
99#pragma warning disable 0618
99 public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext) 100 public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext)
100 : base(serializationInfo, streamingContext) {} 101 : base(serializationInfo, streamingContext) {}
102#pragma warning restore 0618
101 103
102 public override Stream GetResponseStream() 104 public override Stream GetResponseStream()
103 { 105 {
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 6fb28e2..4bafe2f 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -180,6 +180,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
180 /// * Internet 180 /// * Internet
181 /// * Everything 181 /// * Everything
182 /// </remarks> 182 /// </remarks>
183#pragma warning disable 0618
183 public static AppDomain CreateRestrictedDomain(string permissionSetName, string appDomainName) 184 public static AppDomain CreateRestrictedDomain(string permissionSetName, string appDomainName)
184 { 185 {
185 if (permissionSetName == null) 186 if (permissionSetName == null)
@@ -240,6 +241,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
240 241
241 return restrictedDomain; 242 return restrictedDomain;
242 } 243 }
244#pragma warning restore 0618
243 245
244 246
245 void EventManager_OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource) 247 void EventManager_OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource)
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs
index 3651351..5a5de11 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs
@@ -50,7 +50,6 @@ public class HullCreation : OpenSimTestCase
50 50
51 BSScene PhysicsScene { get; set; } 51 BSScene PhysicsScene { get; set; }
52 Vector3 ObjectInitPosition; 52 Vector3 ObjectInitPosition;
53 float simulationTimeStep = 0.089f;
54 53
55 [TestFixtureSetUp] 54 [TestFixtureSetUp]
56 public void Init() 55 public void Init()
diff --git a/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs
index 06eaf2e..dac4ca8 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs
@@ -44,7 +44,9 @@ namespace OpenSim.Server.Handlers.Hypergrid
44 public HeloServiceInConnector(IConfigSource config, IHttpServer server, string configName) : 44 public HeloServiceInConnector(IConfigSource config, IHttpServer server, string configName) :
45 base(config, server, configName) 45 base(config, server, configName)
46 { 46 {
47#pragma warning disable 0612
47 server.AddStreamHandler(new HeloServerGetHandler("opensim-robust")); 48 server.AddStreamHandler(new HeloServerGetHandler("opensim-robust"));
49#pragma warning restore 0612
48 server.AddStreamHandler(new HeloServerHeadHandler("opensim-robust")); 50 server.AddStreamHandler(new HeloServerHeadHandler("opensim-robust"));
49 } 51 }
50 } 52 }
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
index 15b5b31..e112e0e 100644
--- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
@@ -99,8 +99,10 @@ namespace OpenSim.Server.Handlers.Hypergrid
99 server.AddXmlRPCHandler("verify_client", VerifyClient, false); 99 server.AddXmlRPCHandler("verify_client", VerifyClient, false);
100 server.AddXmlRPCHandler("logout_agent", LogoutAgent, false); 100 server.AddXmlRPCHandler("logout_agent", LogoutAgent, false);
101 101
102#pragma warning disable 0612
102 server.AddXmlRPCHandler("status_notification", StatusNotification, false); 103 server.AddXmlRPCHandler("status_notification", StatusNotification, false);
103 server.AddXmlRPCHandler("get_online_friends", GetOnlineFriends, false); 104 server.AddXmlRPCHandler("get_online_friends", GetOnlineFriends, false);
105#pragma warning restore 0612
104 server.AddXmlRPCHandler("get_user_info", GetUserInfo, false); 106 server.AddXmlRPCHandler("get_user_info", GetUserInfo, false);
105 server.AddXmlRPCHandler("get_server_urls", GetServerURLs, false); 107 server.AddXmlRPCHandler("get_server_urls", GetServerURLs, false);
106 108