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/Inventory/Transfer | |
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/Inventory/Transfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | { |