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/CoreModules/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 | |
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/CoreModules/Avatar')
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 5b04a39..7f083a9 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
| @@ -62,7 +62,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 62 | 62 | ||
| 63 | private object m_setAppearanceLock = new object(); | 63 | private object m_setAppearanceLock = new object(); |
| 64 | 64 | ||
| 65 | #region IRegionModule | 65 | #region Region Module interface |
| 66 | 66 | ||
| 67 | public void Initialise(IConfigSource config) | 67 | public void Initialise(IConfigSource config) |
| 68 | { | 68 | { |
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index 727f1c9..a48b700 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
| @@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 54 | 54 | ||
| 55 | private readonly List<Scene> m_scenes = new List<Scene>(); | 55 | private readonly List<Scene> m_scenes = new List<Scene>(); |
| 56 | 56 | ||
| 57 | #region IRegionModule Members | 57 | #region Region Module interface |
| 58 | 58 | ||
| 59 | private IMessageTransferModule m_TransferModule = null; | 59 | private IMessageTransferModule m_TransferModule = null; |
| 60 | 60 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index e26beec..5d20524 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
| @@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
| 51 | private IMessageTransferModule m_TransferModule = null; | 51 | private IMessageTransferModule m_TransferModule = null; |
| 52 | private bool m_Enabled = true; | 52 | private bool m_Enabled = true; |
| 53 | 53 | ||
| 54 | #region IRegionModule Members | 54 | #region Region Module interface |
| 55 | 55 | ||
| 56 | public void Initialise(IConfigSource config) | 56 | public void Initialise(IConfigSource config) |
| 57 | { | 57 | { |