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

Merge branch 'avination' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
	OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
	OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
This commit is contained in:
Melanie
2012-06-11 16:56:40 +01:00
parent 82753d8673 853449d5bc
commit 84377a23db
20 changed files with 25402 additions and 23771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
View File

@@ -127,6 +127,11 @@ namespace OpenSim.Data.Null
{
m_store.RemoveRegionEnvironmentSettings(regionUUID);
}
public UUID[] GetObjectIDs(UUID regionID)
{
return new UUID[0];
}
}
/// <summary>
@@ -318,5 +323,10 @@ namespace OpenSim.Data.Null
public void Shutdown()
{
}
public UUID[] GetObjectIDs(UUID regionID)
{
return new UUID[0];
}
}
}