aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces
diff options
context:
space:
mode:
authorMelanie2011-01-28 02:37:59 +0000
committerMelanie2011-01-28 02:37:59 +0000
commit57bf5d9b2aa69d7535595007c867a3d24c108b90 (patch)
tree3b9e64e78760d1714be42989aa1959e842839347 /OpenSim/Region/Framework/Interfaces
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentFix bumping into sim borders and check estate bans for walking crossings (diff)
downloadopensim-SC_OLD-57bf5d9b2aa69d7535595007c867a3d24c108b90.zip
opensim-SC_OLD-57bf5d9b2aa69d7535595007c867a3d24c108b90.tar.gz
opensim-SC_OLD-57bf5d9b2aa69d7535595007c867a3d24c108b90.tar.bz2
opensim-SC_OLD-57bf5d9b2aa69d7535595007c867a3d24c108b90.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
index 45ca5c5..3eb38b8 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Framework.Interfaces
42 42
43 bool TeleportHome(UUID id, IClientAPI client); 43 bool TeleportHome(UUID id, IClientAPI client);
44 44
45 void Cross(ScenePresence agent, bool isFlying); 45 bool Cross(ScenePresence agent, bool isFlying);
46 46
47 void AgentArrivedAtDestination(UUID agent); 47 void AgentArrivedAtDestination(UUID agent);
48 48