diff options
| author | Melanie | 2012-11-13 02:10:09 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-13 02:10:09 +0000 |
| commit | 9a5679876ed158f9944f209cbb68f370fabe8d12 (patch) | |
| tree | d5f282b13c448abec9f7329e88647cec459ede5f /OpenSim/Region/CoreModules/Agent | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-9a5679876ed158f9944f209cbb68f370fabe8d12.zip opensim-SC_OLD-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.gz opensim-SC_OLD-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.bz2 opensim-SC_OLD-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
| -rw-r--r-- | OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs index 8237faf..7113f4f 100644 --- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs | |||
| @@ -39,7 +39,7 @@ using Mono.Addins; | |||
| 39 | 39 | ||
| 40 | namespace OpenSim.Region.CoreModules.Agent.Xfer | 40 | namespace OpenSim.Region.CoreModules.Agent.Xfer |
| 41 | { | 41 | { |
| 42 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 42 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XferModule")] |
| 43 | public class XferModule : INonSharedRegionModule, IXfer | 43 | public class XferModule : INonSharedRegionModule, IXfer |
| 44 | { | 44 | { |
| 45 | private Scene m_scene; | 45 | private Scene m_scene; |