aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent/Xfer
diff options
context:
space:
mode:
authorMelanie2010-01-29 07:20:13 +0000
committerMelanie2010-01-29 07:21:06 +0000
commita87a247f0548d39a8c39b1d28123d7da8db44598 (patch)
tree7f9f77c38a224bc6d4bea7ccced1d4710c8a91b1 /OpenSim/Region/CoreModules/Agent/Xfer
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-a87a247f0548d39a8c39b1d28123d7da8db44598.zip
opensim-SC-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.gz
opensim-SC-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.bz2
opensim-SC-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.xz
Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/Xfer')
-rw-r--r--OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs30
1 files changed, 9 insertions, 21 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
index d062361..ef7dce8 100644
--- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
@@ -27,7 +27,6 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using Mono.Addins;
31using Nini.Config; 30using Nini.Config;
32using OpenMetaverse; 31using OpenMetaverse;
33using OpenSim.Framework; 32using OpenSim.Framework;
@@ -36,8 +35,7 @@ using OpenSim.Region.Framework.Scenes;
36 35
37namespace OpenSim.Region.CoreModules.Agent.Xfer 36namespace OpenSim.Region.CoreModules.Agent.Xfer
38{ 37{
39 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] 38 public class XferModule : IRegionModule, IXfer
40 public class XferModule : INonSharedRegionModule, IXfer
41 { 39 {
42 private Scene m_scene; 40 private Scene m_scene;
43 private Dictionary<string, XferRequest> Requests = new Dictionary<string, XferRequest>(); 41 private Dictionary<string, XferRequest> Requests = new Dictionary<string, XferRequest>();
@@ -54,13 +52,9 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
54 public DateTime timeStamp; 52 public DateTime timeStamp;
55 } 53 }
56 54
57 #region INonSharedRegionModule Members 55 #region IRegionModule Members
58 56
59 public void Initialise(IConfigSource config) 57 public void Initialise(Scene scene, IConfigSource config)
60 {
61 }
62
63 public void AddRegion(Scene scene)
64 { 58 {
65 m_scene = scene; 59 m_scene = scene;
66 m_scene.EventManager.OnNewClient += NewClient; 60 m_scene.EventManager.OnNewClient += NewClient;
@@ -68,21 +62,10 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
68 m_scene.RegisterModuleInterface<IXfer>(this); 62 m_scene.RegisterModuleInterface<IXfer>(this);
69 } 63 }
70 64
71 public Type ReplaceableInterface 65 public void PostInitialise()
72 {
73 get { return null; }
74 }
75
76 public void RegionLoaded(Scene scene)
77 { 66 {
78 } 67 }
79 68
80 public void RemoveRegion(Scene scene)
81 {
82 scene.EventManager.OnNewClient -= NewClient;
83 scene.UnregisterModuleInterface<IXfer>(this);
84 }
85
86 public void Close() 69 public void Close()
87 { 70 {
88 } 71 }
@@ -92,6 +75,11 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
92 get { return "XferModule"; } 75 get { return "XferModule"; }
93 } 76 }
94 77
78 public bool IsSharedModule
79 {
80 get { return false; }
81 }
82
95 #endregion 83 #endregion
96 84
97 #region IXfer Members 85 #region IXfer Members