diff options
author | Robert Adams | 2014-01-26 19:32:28 -0800 |
---|---|---|
committer | Robert Adams | 2014-01-26 19:32:28 -0800 |
commit | 49af6b53e74123ccebdbd411d456cb8bae528d61 (patch) | |
tree | fc636f3cb3b497c2241633d2908d6882f8d5bfa2 /OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | |
parent | Merge branch 'master' into varregion (diff) | |
download | opensim-SC_OLD-49af6b53e74123ccebdbd411d456cb8bae528d61.zip opensim-SC_OLD-49af6b53e74123ccebdbd411d456cb8bae528d61.tar.gz opensim-SC_OLD-49af6b53e74123ccebdbd411d456cb8bae528d61.tar.bz2 opensim-SC_OLD-49af6b53e74123ccebdbd411d456cb8bae528d61.tar.xz |
varregion: enable teleporting to a varregion by clicking on the map and
pressing the 'teleport' button.
This commit adds returning region map info for all the subregions of a
varregion. This also handles the selection of the extra region and then
the displacement of the postion so the teleport is to the correct location.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs index c63b409..16d9b7d 100644 --- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | |||
@@ -48,6 +48,7 @@ namespace OpenSim.Server.Handlers.Grid | |||
48 | public class GridServerPostHandler : BaseStreamHandler | 48 | public class GridServerPostHandler : BaseStreamHandler |
49 | { | 49 | { |
50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
51 | private static string LogHeader = "[GRID HANDLER]"; | ||
51 | 52 | ||
52 | private IGridService m_GridService; | 53 | private IGridService m_GridService; |
53 | 54 | ||
@@ -281,8 +282,8 @@ namespace OpenSim.Server.Handlers.Grid | |||
281 | else | 282 | else |
282 | m_log.WarnFormat("[GRID HANDLER]: no Y in request to get region by position"); | 283 | m_log.WarnFormat("[GRID HANDLER]: no Y in request to get region by position"); |
283 | 284 | ||
285 | // m_log.DebugFormat("{0} GetRegionByPosition: loc=<{1},{2}>", LogHeader, x, y); | ||
284 | GridRegion rinfo = m_GridService.GetRegionByPosition(scopeID, x, y); | 286 | GridRegion rinfo = m_GridService.GetRegionByPosition(scopeID, x, y); |
285 | //m_log.DebugFormat("[GRID HANDLER]: neighbours for region {0}: {1}", regionID, rinfos.Count); | ||
286 | 287 | ||
287 | Dictionary<string, object> result = new Dictionary<string, object>(); | 288 | Dictionary<string, object> result = new Dictionary<string, object>(); |
288 | if (rinfo == null) | 289 | if (rinfo == null) |