ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into varregion

Browse Source 
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.
This commit is contained in:
Robert Adams
2014-01-04 08:57:51 -08:00
parent 9984ecf862 eab9390e05
commit fd045d520e
3 changed files with 10702 additions and 9300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/Interfaces/IGridService.cs
View File

@@ -227,6 +227,8 @@ namespace OpenSim.Services.Interfaces
public GridRegion()
{
RegionSizeX = (int)Constants.RegionSize;
RegionSizeY = (int)Constants.RegionSize;
m_serverURI = string.Empty;
}