Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge

This commit is contained in:
Melanie
2011-10-11 21:30:42 +01:00
8 changed files with 287 additions and 166 deletions

View File

@@ -1,4 +1,4 @@
/*
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
@@ -90,6 +90,11 @@ namespace OpenSim.Services.Connectors
{
return m_database.LoadEstateSettings(estateID);
}
public EstateSettings CreateNewEstate()
{
return m_database.CreateNewEstate();
}
public List<EstateSettings> LoadEstateSettingsAll()
{