diff options
| author | Melanie | 2012-09-09 13:30:24 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-09 13:30:24 +0100 |
| commit | 0d97beefce9eaa675c93504b7cb8230e75e17763 (patch) | |
| tree | 587516c2fdf96179c93a0d37624a8d3a9f7bebdd /OpenSim/Services | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | implementing per-region configuration of limits on the number of prims one ca... (diff) | |
| download | opensim-SC_OLD-0d97beefce9eaa675c93504b7cb8230e75e17763.zip opensim-SC_OLD-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.gz opensim-SC_OLD-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.bz2 opensim-SC_OLD-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index 0e4d794..67a10b0 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
| @@ -112,7 +112,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 112 | // m_log.Warn("Registering region " + regionInfo.RegionName + " (" + regionInfo.RegionID + ") that we are not tracking"); | 112 | // m_log.Warn("Registering region " + regionInfo.RegionName + " (" + regionInfo.RegionID + ") that we are not tracking"); |
| 113 | 113 | ||
| 114 | Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0); | 114 | Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0); |
| 115 | Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0); | 115 | Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight); |
| 116 | 116 | ||
| 117 | OSDMap extraData = new OSDMap | 117 | OSDMap extraData = new OSDMap |
| 118 | { | 118 | { |
| @@ -297,7 +297,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 297 | List<GridRegion> foundRegions = new List<GridRegion>(); | 297 | List<GridRegion> foundRegions = new List<GridRegion>(); |
| 298 | 298 | ||
| 299 | Vector3d minPosition = new Vector3d(xmin, ymin, 0.0); | 299 | Vector3d minPosition = new Vector3d(xmin, ymin, 0.0); |
| 300 | Vector3d maxPosition = new Vector3d(xmax, ymax, 4096.0); | 300 | Vector3d maxPosition = new Vector3d(xmax, ymax, Constants.RegionHeight); |
| 301 | 301 | ||
| 302 | NameValueCollection requestArgs = new NameValueCollection | 302 | NameValueCollection requestArgs = new NameValueCollection |
| 303 | { | 303 | { |