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

bad merge?

Browse Source
This commit is contained in:
UbitUmarov
2015-09-01 14:54:35 +01:00
parent f811fdfb70 31a50a73cb
commit 371c9dd2af
406 changed files with 62562 additions and 8067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Data/Null/NullRegionData.cs
View File

@@ -140,7 +140,8 @@ namespace OpenSim.Data.Null
{
foreach (RegionData r in m_regionData.Values)
{
if (r.posX == posX && r.posY == posY)
if (posX >= r.posX && posX < r.posX + r.sizeX
&& posY >= r.posY && posY < r.posY + r.sizeY)
ret.Add(r);
}
}
@@ -176,8 +177,9 @@ namespace OpenSim.Data.Null
{
foreach (RegionData r in m_regionData.Values)
{
if (r.posX >= startX && r.posX <= endX && r.posY >= startY && r.posY <= endY)
ret.Add(r);
if (r.posX + r.sizeX > startX && r.posX <= endX
&& r.posY + r.sizeX > startY && r.posY <= endY)
ret.Add(r);
}
}

5
OpenSim/Data/Null/NullSimulationData.cs
View File

@@ -184,6 +184,11 @@ namespace OpenSim.Data.Null
{
}
public UUID[] GetObjectIDs(UUID regionID)
{
return new UUID[0];
}
public void SaveExtra(UUID regionID, string name, string value)
{
}

5
OpenSim/Data/Null/NullUserAccountData.cs
View File

@@ -193,5 +193,10 @@ namespace OpenSim.Data.Null
return false;
}
public UserAccountData[] GetUsersWhere(UUID scopeID, string where)
{
return null;
}
}
}