aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2015-08-15 16:08:14 -0700
committerDiva Canto2015-08-15 16:08:14 -0700
commit4cbbbefbf63f6cab4241563ebf56c6b0bea30ed3 (patch)
tree02f734f0969199bb964dde5eee73841c820643bd
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-4cbbbefbf63f6cab4241563ebf56c6b0bea30ed3.zip
opensim-SC_OLD-4cbbbefbf63f6cab4241563ebf56c6b0bea30ed3.tar.gz
opensim-SC_OLD-4cbbbefbf63f6cab4241563ebf56c6b0bea30ed3.tar.bz2
opensim-SC_OLD-4cbbbefbf63f6cab4241563ebf56c6b0bea30ed3.tar.xz
Removed ignoreCase=true from the call to Type.GetInterface, because, well, we don't want to ignore case. And this seems to be causing problems in mono 4.3.
-rw-r--r--OpenSim/Region/ClientStack/ClientStackManager.cs2
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs4
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs2
-rw-r--r--OpenSim/Services/Base/ServiceBase.cs2
4 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs
index 299aabd..3ec968f 100644
--- a/OpenSim/Region/ClientStack/ClientStackManager.cs
+++ b/OpenSim/Region/ClientStack/ClientStackManager.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.ClientStack
67 { 67 {
68 if (pluginType.IsPublic) 68 if (pluginType.IsPublic)
69 { 69 {
70 Type typeInterface = pluginType.GetInterface("IClientNetworkServer", true); 70 Type typeInterface = pluginType.GetInterface("IClientNetworkServer");
71 71
72 if (typeInterface != null) 72 if (typeInterface != null)
73 { 73 {
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index 9b06353..d8279b7 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Physics.Manager
172 { 172 {
173 if (!pluginType.IsAbstract) 173 if (!pluginType.IsAbstract)
174 { 174 {
175 Type physTypeInterface = pluginType.GetInterface("IPhysicsPlugin", true); 175 Type physTypeInterface = pluginType.GetInterface("IPhysicsPlugin");
176 176
177 if (physTypeInterface != null) 177 if (physTypeInterface != null)
178 { 178 {
@@ -186,7 +186,7 @@ namespace OpenSim.Region.Physics.Manager
186 } 186 }
187 } 187 }
188 188
189 Type meshTypeInterface = pluginType.GetInterface("IMeshingPlugin", true); 189 Type meshTypeInterface = pluginType.GetInterface("IMeshingPlugin");
190 190
191 if (meshTypeInterface != null) 191 if (meshTypeInterface != null)
192 { 192 {
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index c384406..18a4266 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -268,7 +268,7 @@ namespace OpenSim.Server.Base
268 && pluginType.ToString() != pluginType.Namespace + "." + className) 268 && pluginType.ToString() != pluginType.Namespace + "." + className)
269 continue; 269 continue;
270 270
271 Type typeInterface = pluginType.GetInterface(interfaceName, true); 271 Type typeInterface = pluginType.GetInterface(interfaceName);
272 272
273 if (typeInterface != null) 273 if (typeInterface != null)
274 { 274 {
diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs
index addbe94..a7eb2be 100644
--- a/OpenSim/Services/Base/ServiceBase.cs
+++ b/OpenSim/Services/Base/ServiceBase.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Services.Base
86 continue; 86 continue;
87 87
88 Type typeInterface = 88 Type typeInterface =
89 pluginType.GetInterface(interfaceName, true); 89 pluginType.GetInterface(interfaceName);
90 if (typeInterface != null) 90 if (typeInterface != null)
91 { 91 {
92 T plug = (T)Activator.CreateInstance(pluginType, 92 T plug = (T)Activator.CreateInstance(pluginType,