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
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/Avatar
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
4 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
index 1528330..e03a27c 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
        private int m_usersOnlineCacheExpirySeconds = 20;
-        #region IRegionModuleBase Members
+        #region Region Module interfaceBase Members
        public void Initialise(IConfigSource config)
        {
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 79e9994..f26092a 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
        private bool m_debugEnabled = false;
        private int  m_levelGroupCreate = 0;
-        #region IRegionModuleBase Members
+        #region Region Module interfaceBase Members
        public void Initialise(IConfigSource config)
        {
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
index 5d57f70..5c7a3ac 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
@@ -176,7 +176,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
        // private IUserAccountService m_accountService = null;
        
-        #region IRegionModuleBase Members
+        #region Region Module interfaceBase Members
        public string Name
        {
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index d412cd1..cfc26a0 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
        private Dictionary<UUID, List<UUID>> m_groupsAgentsDroppedFromChatSession = new Dictionary<UUID, List<UUID>>();
        private Dictionary<UUID, List<UUID>> m_groupsAgentsInvitedToChatSession = new Dictionary<UUID, List<UUID>>();
-        #region IRegionModuleBase Members
+        #region Region Module interfaceBase Members
        public string Name
        {
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/Avatar
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

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs index 1528330..e03a27c 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
79		79
80	private int m_usersOnlineCacheExpirySeconds = 20;	80	private int m_usersOnlineCacheExpirySeconds = 20;
81		81
82	#region IRegionModuleBase Members	82	#region Region Module interfaceBase Members
83		83
84	public void Initialise(IConfigSource config)	84	public void Initialise(IConfigSource config)
85	{	85	{


diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 79e9994..f26092a 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
86	private bool m_debugEnabled = false;	86	private bool m_debugEnabled = false;
87	private int m_levelGroupCreate = 0;	87	private int m_levelGroupCreate = 0;
88		88
89	#region IRegionModuleBase Members	89	#region Region Module interfaceBase Members
90		90
91	public void Initialise(IConfigSource config)	91	public void Initialise(IConfigSource config)
92	{	92	{


diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs index 5d57f70..5c7a3ac 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
@@ -176,7 +176,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
176	// private IUserAccountService m_accountService = null;	176	// private IUserAccountService m_accountService = null;
177		177
178		178
179	#region IRegionModuleBase Members	179	#region Region Module interfaceBase Members
180		180
181	public string Name	181	public string Name
182	{	182	{


diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs index d412cd1..cfc26a0 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
83	private Dictionary<UUID, List<UUID>> m_groupsAgentsDroppedFromChatSession = new Dictionary<UUID, List<UUID>>();	83	private Dictionary<UUID, List<UUID>> m_groupsAgentsDroppedFromChatSession = new Dictionary<UUID, List<UUID>>();
84	private Dictionary<UUID, List<UUID>> m_groupsAgentsInvitedToChatSession = new Dictionary<UUID, List<UUID>>();	84	private Dictionary<UUID, List<UUID>> m_groupsAgentsInvitedToChatSession = new Dictionary<UUID, List<UUID>>();
85		85
86	#region IRegionModuleBase Members	86	#region Region Module interfaceBase Members
87		87
88	public string Name	88	public string Name
89	{	89	{