aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/MapBlockData.cs
diff options
context:
space:
mode:
authorRobert Adams2014-01-26 19:32:28 -0800
committerRobert Adams2014-01-26 19:32:28 -0800
commit49af6b53e74123ccebdbd411d456cb8bae528d61 (patch)
treefc636f3cb3b497c2241633d2908d6882f8d5bfa2 /OpenSim/Framework/MapBlockData.cs
parentMerge branch 'master' into varregion (diff)
downloadopensim-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 'OpenSim/Framework/MapBlockData.cs')
-rw-r--r--OpenSim/Framework/MapBlockData.cs18
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Framework/MapBlockData.cs b/OpenSim/Framework/MapBlockData.cs
index 2298ac5..4bee499 100644
--- a/OpenSim/Framework/MapBlockData.cs
+++ b/OpenSim/Framework/MapBlockData.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenMetaverse.StructuredData;
30 31
31namespace OpenSim.Framework 32namespace OpenSim.Framework
32{ 33{
@@ -40,9 +41,26 @@ namespace OpenSim.Framework
40 public byte WaterHeight; 41 public byte WaterHeight;
41 public ushort X; 42 public ushort X;
42 public ushort Y; 43 public ushort Y;
44 public ushort SizeX;
45 public ushort SizeY;
43 46
44 public MapBlockData() 47 public MapBlockData()
45 { 48 {
46 } 49 }
50
51 public OSDMap ToOSD()
52 {
53 OSDMap map = new OSDMap();
54 map["X"] = X;
55 map["Y"] = Y;
56 map["SizeX"] = SizeX;
57 map["SizeY"] = SizeY;
58 map["Name"] = Name;
59 map["Access"] = Access;
60 map["RegionFlags"] = RegionFlags;
61 map["WaterHeight"] = WaterHeight;
62 map["MapImageID"] = MapImageId;
63 return map;
64 }
47 } 65 }
48} 66}