diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 1af41be..d0edcda 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -91,10 +91,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
91 | public Dictionary<Type, object> ModuleInterfaces = new Dictionary<Type, object>(); | 91 | public Dictionary<Type, object> ModuleInterfaces = new Dictionary<Type, object>(); |
92 | protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>(); | 92 | protected Dictionary<string, object> ModuleAPIMethods = new Dictionary<string, object>(); |
93 | 93 | ||
94 | //API method Delegates and interfaces | 94 | //API module interfaces |
95 | 95 | ||
96 | // this most likely shouldn't be handled as a API method like this, but doing it for testing purposes | 96 | public IXfer XferManager; |
97 | public ModuleAPIMethod2<bool, string, byte[]> AddXferFile = null; | ||
98 | 97 | ||
99 | private IHttpRequests m_httpRequestModule = null; | 98 | private IHttpRequests m_httpRequestModule = null; |
100 | private ISimChat m_simChatModule = null; | 99 | private ISimChat m_simChatModule = null; |
@@ -206,8 +205,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
206 | m_simChatModule = this.RequestModuleInterface<ISimChat>(); | 205 | m_simChatModule = this.RequestModuleInterface<ISimChat>(); |
207 | m_httpRequestModule = this.RequestModuleInterface<IHttpRequests>(); | 206 | m_httpRequestModule = this.RequestModuleInterface<IHttpRequests>(); |
208 | 207 | ||
209 | //should change so it uses the module interface functions | 208 | XferManager = this.RequestModuleInterface<IXfer>(); |
210 | AddXferFile = (ModuleAPIMethod2<bool, string, byte[]>)this.RequestAPIMethod("API_AddXferFile"); | ||
211 | } | 209 | } |
212 | 210 | ||
213 | #region Script Handling Methods | 211 | #region Script Handling Methods |
@@ -605,7 +603,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
605 | { | 603 | { |
606 | if (!Entities.ContainsKey(sceneObject.UUID)) | 604 | if (!Entities.ContainsKey(sceneObject.UUID)) |
607 | { | 605 | { |
608 | QuadTree.AddObject(sceneObject); | 606 | // QuadTree.AddObject(sceneObject); |
609 | Entities.Add(sceneObject.UUID, sceneObject); | 607 | Entities.Add(sceneObject.UUID, sceneObject); |
610 | } | 608 | } |
611 | } | 609 | } |