diff options
| author | Melanie | 2012-11-12 23:27:47 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-12 23:27:47 +0000 |
| commit | 2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc (patch) | |
| tree | 308caeac8741ef507a3f02f41d4403a29d06b06e /OpenSim/Region/OptionalModules/Scripting | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Completely remove the IRegionModule interface (diff) | |
| download | opensim-SC_OLD-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.zip opensim-SC_OLD-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.gz opensim-SC_OLD-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.bz2 opensim-SC_OLD-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/ModuleLoader.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Scripting')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs index 732c28f..e68764a 100644 --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs | |||
| @@ -59,7 +59,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
| 59 | private Dictionary<UUID,JsonStore> m_JsonValueStore; | 59 | private Dictionary<UUID,JsonStore> m_JsonValueStore; |
| 60 | private UUID m_sharedStore; | 60 | private UUID m_sharedStore; |
| 61 | 61 | ||
| 62 | #region IRegionModule Members | 62 | #region Region Module interface |
| 63 | 63 | ||
| 64 | // ----------------------------------------------------------------- | 64 | // ----------------------------------------------------------------- |
| 65 | /// <summary> | 65 | /// <summary> |
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs index 6910d14..0c175ca 100644 --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs | |||
| @@ -58,7 +58,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
| 58 | private IScriptModuleComms m_comms; | 58 | private IScriptModuleComms m_comms; |
| 59 | private IJsonStoreModule m_store; | 59 | private IJsonStoreModule m_store; |
| 60 | 60 | ||
| 61 | #region IRegionModule Members | 61 | #region Region Module interface |
| 62 | 62 | ||
| 63 | // ----------------------------------------------------------------- | 63 | // ----------------------------------------------------------------- |
| 64 | /// <summary> | 64 | /// <summary> |