diff options
| author | Melanie | 2011-11-01 23:54:09 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-01 23:54:09 +0000 |
| commit | b69f679122fb7fdc0f77fc198e148f42797a2eef (patch) | |
| tree | e06d4f4572a91a58c79c03c60b0fca5574467834 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Removed see_into_this_sim_from_neighbor configuration option. (diff) | |
| download | opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.zip opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.gz opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.bz2 opensim-SC_OLD-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 0fb346a..b49f23c 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
| @@ -1180,7 +1180,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 1180 | else | 1180 | else |
| 1181 | { | 1181 | { |
| 1182 | OSDArray responsearr = new OSDArray(); // Don't preallocate. MT (m_scene.GetRootAgentCount()); | 1182 | OSDArray responsearr = new OSDArray(); // Don't preallocate. MT (m_scene.GetRootAgentCount()); |
| 1183 | m_scene.ForEachScenePresence(delegate(ScenePresence sp) | 1183 | m_scene.ForEachRootScenePresence(delegate(ScenePresence sp) |
| 1184 | { | 1184 | { |
| 1185 | OSDMap responsemapdata = new OSDMap(); | 1185 | OSDMap responsemapdata = new OSDMap(); |
| 1186 | responsemapdata["X"] = OSD.FromInteger((int)(xstart + sp.AbsolutePosition.X)); | 1186 | responsemapdata["X"] = OSD.FromInteger((int)(xstart + sp.AbsolutePosition.X)); |