diff options
author | Diva Canto | 2010-01-15 17:14:48 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-15 17:14:48 -0800 |
commit | 4ac3c0e81b8760ef31f741cd55e703eee86b93b7 (patch) | |
tree | 18565d8b20669ccdc45e3ef02d59cfd1eabaa297 /OpenSim/Region/Framework | |
parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
download | opensim-SC_OLD-4ac3c0e81b8760ef31f741cd55e703eee86b93b7.zip opensim-SC_OLD-4ac3c0e81b8760ef31f741cd55e703eee86b93b7.tar.gz opensim-SC_OLD-4ac3c0e81b8760ef31f741cd55e703eee86b93b7.tar.bz2 opensim-SC_OLD-4ac3c0e81b8760ef31f741cd55e703eee86b93b7.tar.xz |
Renamed IAgentTransferModule to IEntityTransferModule -- accounts for objects too.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs (renamed from OpenSim/Region/Framework/Interfaces/IAgentTransferModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAgentTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs index 76745d6..96884b3 100644 --- a/OpenSim/Region/Framework/Interfaces/IAgentTransferModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs | |||
@@ -34,7 +34,7 @@ using OpenSim.Region.Framework.Scenes; | |||
34 | 34 | ||
35 | namespace OpenSim.Region.Framework.Interfaces | 35 | namespace OpenSim.Region.Framework.Interfaces |
36 | { | 36 | { |
37 | public interface IAgentTransferModule | 37 | public interface IEntityTransferModule |
38 | { | 38 | { |
39 | void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, | 39 | void Teleport(ScenePresence agent, ulong regionHandle, Vector3 position, |
40 | Vector3 lookAt, uint teleportFlags); | 40 | Vector3 lookAt, uint teleportFlags); |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index dcbbe08..62734ff 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -315,7 +315,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
315 | protected IConfigSource m_config; | 315 | protected IConfigSource m_config; |
316 | protected IRegionSerialiserModule m_serialiser; | 316 | protected IRegionSerialiserModule m_serialiser; |
317 | protected IDialogModule m_dialogModule; | 317 | protected IDialogModule m_dialogModule; |
318 | protected IAgentTransferModule m_teleportModule; | 318 | protected IEntityTransferModule m_teleportModule; |
319 | 319 | ||
320 | protected ICapabilitiesModule m_capsModule; | 320 | protected ICapabilitiesModule m_capsModule; |
321 | public ICapabilitiesModule CapsModule | 321 | public ICapabilitiesModule CapsModule |
@@ -1218,7 +1218,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1218 | m_serialiser = RequestModuleInterface<IRegionSerialiserModule>(); | 1218 | m_serialiser = RequestModuleInterface<IRegionSerialiserModule>(); |
1219 | m_dialogModule = RequestModuleInterface<IDialogModule>(); | 1219 | m_dialogModule = RequestModuleInterface<IDialogModule>(); |
1220 | m_capsModule = RequestModuleInterface<ICapabilitiesModule>(); | 1220 | m_capsModule = RequestModuleInterface<ICapabilitiesModule>(); |
1221 | m_teleportModule = RequestModuleInterface<IAgentTransferModule>(); | 1221 | m_teleportModule = RequestModuleInterface<IEntityTransferModule>(); |
1222 | } | 1222 | } |
1223 | 1223 | ||
1224 | #endregion | 1224 | #endregion |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 711f9d9..2c8c675 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1110,7 +1110,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1110 | // Create child agents in neighbouring regions | 1110 | // Create child agents in neighbouring regions |
1111 | if (!m_isChildAgent) | 1111 | if (!m_isChildAgent) |
1112 | { | 1112 | { |
1113 | IAgentTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IAgentTransferModule>(); | 1113 | IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); |
1114 | if (m_agentTransfer != null) | 1114 | if (m_agentTransfer != null) |
1115 | m_agentTransfer.EnableChildAgents(this); | 1115 | m_agentTransfer.EnableChildAgents(this); |
1116 | else | 1116 | else |
@@ -2193,7 +2193,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2193 | 2193 | ||
2194 | if (m_scene.SceneGridService != null) | 2194 | if (m_scene.SceneGridService != null) |
2195 | { | 2195 | { |
2196 | IAgentTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IAgentTransferModule>(); | 2196 | IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); |
2197 | if (m_agentTransfer != null) | 2197 | if (m_agentTransfer != null) |
2198 | m_agentTransfer.EnableChildAgents(this); | 2198 | m_agentTransfer.EnableChildAgents(this); |
2199 | } | 2199 | } |