aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/IClientAPI.cs
diff options
context:
space:
mode:
authorMelanie2011-05-09 18:37:35 +0100
committerMelanie2011-05-09 18:37:35 +0100
commit1bd949614a927f32b7194ecefaeb74fdd46cab4f (patch)
tree8974bd63062468b776c2a8de31d3de5a8ff3ea69 /OpenSim/Framework/IClientAPI.cs
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentFixes gray tiles on map search for viewers 1. (diff)
downloadopensim-SC_OLD-1bd949614a927f32b7194ecefaeb74fdd46cab4f.zip
opensim-SC_OLD-1bd949614a927f32b7194ecefaeb74fdd46cab4f.tar.gz
opensim-SC_OLD-1bd949614a927f32b7194ecefaeb74fdd46cab4f.tar.bz2
opensim-SC_OLD-1bd949614a927f32b7194ecefaeb74fdd46cab4f.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f187468..3cf5f32 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Framework
77 77
78 public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag); 78 public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag);
79 79
80 public delegate void RequestMapName(IClientAPI remoteClient, string mapName); 80 public delegate void RequestMapName(IClientAPI remoteClient, string mapName, uint flags);
81 81
82 public delegate void TeleportLocationRequest( 82 public delegate void TeleportLocationRequest(
83 IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags); 83 IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags);