aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorBlueWall2012-01-24 17:14:08 -0500
committerBlueWall2012-01-24 17:14:08 -0500
commit3ae6345f1b7a5192ef04a0bff925a4e2bdad210f (patch)
treea79e402839d4215daf9d3d027358f8560ab09655 /OpenSim/Region/CoreModules
parentFix "Abnormal client thread terminations" stat in period CONNECTION STATISTIC... (diff)
parentPut Telehubs on the map (diff)
downloadopensim-SC_OLD-3ae6345f1b7a5192ef04a0bff925a4e2bdad210f.zip
opensim-SC_OLD-3ae6345f1b7a5192ef04a0bff925a4e2bdad210f.tar.gz
opensim-SC_OLD-3ae6345f1b7a5192ef04a0bff925a4e2bdad210f.tar.bz2
opensim-SC_OLD-3ae6345f1b7a5192ef04a0bff925a4e2bdad210f.tar.xz
Merge branch 'master' of /home/opensim/src/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs18
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 9b0e2ff..2f723ef 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1250,6 +1250,24 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
1250 responsemap["7"] = responsearr; 1250 responsemap["7"] = responsearr;
1251 } 1251 }
1252 1252
1253 if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero)
1254 {
1255 SceneObjectPart sop = m_scene.GetSceneObjectPart(m_scene.RegionInfo.RegionSettings.TelehubObject);
1256
1257 OSDArray responsearr = new OSDArray();
1258 OSDMap responsemapdata = new OSDMap();
1259 responsemapdata["X"] = OSD.FromInteger((int)(xstart + sop.AbsolutePosition.X));
1260 responsemapdata["Y"] = OSD.FromInteger((int)(ystart + sop.AbsolutePosition.Y));
1261 // responsemapdata["Z"] = OSD.FromInteger((int)m_scene.GetGroundHeight(x,y));
1262 responsemapdata["ID"] = OSD.FromUUID(sop.UUID);
1263 responsemapdata["Name"] = OSD.FromString(sop.Name);
1264 responsemapdata["Extra"] = OSD.FromInteger(0); // color (unused)
1265 responsemapdata["Extra2"] = OSD.FromInteger(0); // 0 = telehub / 1 = infohub
1266 responsearr.Add(responsemapdata);
1267
1268 responsemap["1"] = responsearr;
1269 }
1270
1253 return responsemap; 1271 return responsemap;
1254 } 1272 }
1255 1273