diff options
| author | Melanie | 2010-12-12 01:20:46 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-12 01:20:46 +0000 |
| commit | 8aa63093b118f257eff87c003e668249c34f5162 (patch) | |
| tree | a5ea5448482d899729c29079ed0dab8394bb9be4 /OpenSim/Region/CoreModules/Framework | |
| parent | Fix border fence for physicals. Fix llRotLookAt() for Vehicles. (diff) | |
| parent | Revert "Another stab at mantis #5256" (diff) | |
| download | opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.zip opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.gz opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.bz2 opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index b5da625..0c59ba1 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1326,7 +1326,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1326 | #region Agent Arrived | 1326 | #region Agent Arrived |
| 1327 | public void AgentArrivedAtDestination(UUID id) | 1327 | public void AgentArrivedAtDestination(UUID id) |
| 1328 | { | 1328 | { |
| 1329 | //m_log.Debug(" >>> ReleaseAgent called <<< "); | 1329 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Agent {0} released", id); |
| 1330 | ResetFromTransit(id); | 1330 | ResetFromTransit(id); |
| 1331 | } | 1331 | } |
| 1332 | 1332 | ||