aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorRobert Adams2014-01-04 08:57:51 -0800
committerRobert Adams2014-01-04 08:57:51 -0800
commitfd045d520ee5142425b5e253e499b82d6bea63e2 (patch)
tree3833c264c9c6da3fed58576aeece466553589656 /OpenSim/Services
parentvarregion: Add region size to teleport event messages (EnableSimulator, (diff)
parentInitialize default region size in GridRegion in the no parameter constructor (diff)
downloadopensim-SC_OLD-fd045d520ee5142425b5e253e499b82d6bea63e2.zip
opensim-SC_OLD-fd045d520ee5142425b5e253e499b82d6bea63e2.tar.gz
opensim-SC_OLD-fd045d520ee5142425b5e253e499b82d6bea63e2.tar.bz2
opensim-SC_OLD-fd045d520ee5142425b5e253e499b82d6bea63e2.tar.xz
Merge branch 'master' into varregion
Conflicts: OpenSim/Framework/Constants.cs OpenSim/Framework/RegionInfo.cs OpenSim/Services/GridService/GridService.cs OpenSim/Services/Interfaces/IGridService.cs Most conflicts had to do with Util routines not in master branch yet.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index ed5189a..502630d 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -227,6 +227,8 @@ namespace OpenSim.Services.Interfaces
227 227
228 public GridRegion() 228 public GridRegion()
229 { 229 {
230 RegionSizeX = (int)Constants.RegionSize;
231 RegionSizeY = (int)Constants.RegionSize;
230 m_serverURI = string.Empty; 232 m_serverURI = string.Empty;
231 } 233 }
232 234