Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

author: Diva Canto 2009-08-10 16:02:33 -0700
committer: Diva Canto 2009-08-10 16:02:33 -0700
commit: 9f95ec499858915de3ccafa0d2b5e23bdcc0ff74 (patch)
tree: 6d456a3bea6952c8ac010e549a9f592017a46902 /OpenSim/ApplicationPlugins
parent: Changed RequestRootFolder to GetRootFolder (diff)
parent: Replace the Replaceable modules name (diff)
download: opensim-SC-9f95ec499858915de3ccafa0d2b5e23bdcc0ff74.zip
opensim-SC-9f95ec499858915de3ccafa0d2b5e23bdcc0ff74.tar.gz
opensim-SC-9f95ec499858915de3ccafa0d2b5e23bdcc0ff74.tar.bz2
opensim-SC-9f95ec499858915de3ccafa0d2b5e23bdcc0ff74.tar.xz
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index 6331519..f30a18b 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -160,7 +160,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
            List<ISharedRegionModule> sharedlist = new List<ISharedRegionModule>();
            foreach (ISharedRegionModule module in m_sharedInstances)
            {
-                Type replaceableInterface = module.ReplacableInterface;
+                Type replaceableInterface = module.ReplaceableInterface;
                if (replaceableInterface != null)
                {
                    MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
@@ -190,7 +190,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
            {
                INonSharedRegionModule module = (INonSharedRegionModule)Activator.CreateInstance(type);
-                Type replaceableInterface = module.ReplacableInterface;
+                Type replaceableInterface = module.ReplaceableInterface;
                if (replaceableInterface != null)
                {
                    MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
@@ -226,7 +226,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
            foreach (ISharedRegionModule module in deferredSharedModules.Values)
            {
-                Type replaceableInterface = module.ReplacableInterface;
+                Type replaceableInterface = module.ReplaceableInterface;
                MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
                if (mii.Invoke(scene, new object[0]) != null)
@@ -247,7 +247,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
            List<INonSharedRegionModule> deferredlist = new List<INonSharedRegionModule>();
            foreach (INonSharedRegionModule module in deferredNonSharedModules.Values)
            {
-                Type replaceableInterface = module.ReplacableInterface;
+                Type replaceableInterface = module.ReplaceableInterface;
                if (replaceableInterface != null)
                {
                    MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
author	Diva Canto	2009-08-10 16:02:33 -0700
committer	Diva Canto	2009-08-10 16:02:33 -0700
commit	9f95ec499858915de3ccafa0d2b5e23bdcc0ff74 (patch)
tree	6d456a3bea6952c8ac010e549a9f592017a46902 /OpenSim/ApplicationPlugins
parent	Changed RequestRootFolder to GetRootFolder (diff)
parent	Replace the Replaceable modules name (diff)
download	opensim-SC-9f95ec499858915de3ccafa0d2b5e23bdcc0ff74.zip opensim-SC-9f95ec499858915de3ccafa0d2b5e23bdcc0ff74.tar.gz opensim-SC-9f95ec499858915de3ccafa0d2b5e23bdcc0ff74.tar.bz2 opensim-SC-9f95ec499858915de3ccafa0d2b5e23bdcc0ff74.tar.xz

diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs index 6331519..f30a18b 100644 --- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs +++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -160,7 +160,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
160	List<ISharedRegionModule> sharedlist = new List<ISharedRegionModule>();	160	List<ISharedRegionModule> sharedlist = new List<ISharedRegionModule>();
161	foreach (ISharedRegionModule module in m_sharedInstances)	161	foreach (ISharedRegionModule module in m_sharedInstances)
162	{	162	{
163	Type replaceableInterface = module.ReplacableInterface;	163	Type replaceableInterface = module.ReplaceableInterface;
164	if (replaceableInterface != null)	164	if (replaceableInterface != null)
165	{	165	{
166	MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);	166	MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
@@ -190,7 +190,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
190	{	190	{
191	INonSharedRegionModule module = (INonSharedRegionModule)Activator.CreateInstance(type);	191	INonSharedRegionModule module = (INonSharedRegionModule)Activator.CreateInstance(type);
192		192
193	Type replaceableInterface = module.ReplacableInterface;	193	Type replaceableInterface = module.ReplaceableInterface;
194	if (replaceableInterface != null)	194	if (replaceableInterface != null)
195	{	195	{
196	MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);	196	MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
@@ -226,7 +226,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
226		226
227	foreach (ISharedRegionModule module in deferredSharedModules.Values)	227	foreach (ISharedRegionModule module in deferredSharedModules.Values)
228	{	228	{
229	Type replaceableInterface = module.ReplacableInterface;	229	Type replaceableInterface = module.ReplaceableInterface;
230	MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);	230	MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);
231		231
232	if (mii.Invoke(scene, new object[0]) != null)	232	if (mii.Invoke(scene, new object[0]) != null)
@@ -247,7 +247,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
247	List<INonSharedRegionModule> deferredlist = new List<INonSharedRegionModule>();	247	List<INonSharedRegionModule> deferredlist = new List<INonSharedRegionModule>();
248	foreach (INonSharedRegionModule module in deferredNonSharedModules.Values)	248	foreach (INonSharedRegionModule module in deferredNonSharedModules.Values)
249	{	249	{
250	Type replaceableInterface = module.ReplacableInterface;	250	Type replaceableInterface = module.ReplaceableInterface;
251	if (replaceableInterface != null)	251	if (replaceableInterface != null)
252	{	252	{
253	MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);	253	MethodInfo mii = mi.MakeGenericMethod(replaceableInterface);