aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting/Minimodule
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/Region/OptionalModules/Scripting/Minimodule
parentXMLRPCModule now actually aborts the worker thread when requested (diff)
downloadopensim-SC-14b4d8bad796527a05a5f5992d1a1df1c5c43e6f.zip
opensim-SC-14b4d8bad796527a05a5f5992d1a1df1c5c43e6f.tar.gz
opensim-SC-14b4d8bad796527a05a5f5992d1a1df1c5c43e6f.tar.bz2
opensim-SC-14b4d8bad796527a05a5f5992d1a1df1c5c43e6f.tar.xz
Eliminated several warnings
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting/Minimodule')
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs2
1 files changed, 2 insertions, 0 deletions
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)