Merge branch 'master' into connector_plugin

Conflicts: OpenSim/Server/Base/ServicesServerBase.cs
author: BlueWall 2012-11-25 17:03:14 -0500
committer: BlueWall 2012-11-25 17:03:14 -0500
commit: c754003944d0166bf50b4f94b0c0eea642503bb0 (patch)
tree: dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
parent: Merge branch 'master' into connector_plugin (diff)
parent: Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download: opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.zip
opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz
opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2
opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz
1 files changed, 1 insertions, 1 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
        private Dictionary<UUID,JsonStore> m_JsonValueStore;
        private UUID m_sharedStore;
-#region IRegionModule Members
+#region Region Module interface
        // -----------------------------------------------------------------
        /// <summary>
author	BlueWall	2012-11-25 17:03:14 -0500
committer	BlueWall	2012-11-25 17:03:14 -0500
commit	c754003944d0166bf50b4f94b0c0eea642503bb0 (patch)
tree	dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
parent	Merge branch 'master' into connector_plugin (diff)
parent	Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download	opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz

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>