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

Merge branch 'master' into varregion

Browse Source 
Add new region crossing code to varregion

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
This commit is contained in:
Robert Adams
2013-12-17 06:18:13 -08:00
parent 13a9a4b653 141d771a93
commit 6937eec258
51 changed files with 2775 additions and 1280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,6 +177,7 @@ namespace OpenSim.Services.Interfaces
/// <summary>
/// The location of this region in meters.
/// DANGER DANGER! Note that this name means something different in RegionInfo.
/// </summary>
public int RegionLocX
{
@@ -189,7 +190,8 @@ namespace OpenSim.Services.Interfaces
public int RegionSizeY { get; set; }
/// <summary>
/// The location of this region in meters.
/// The location of this region in meters.
/// DANGER DANGER! Note that this name means something different in RegionInfo.
/// </summary>
public int RegionLocY
{