diff options
author | Melanie | 2011-10-12 00:10:15 +0200 |
---|---|---|
committer | Melanie | 2011-10-12 00:10:15 +0200 |
commit | 1c2b5d99c9601a3d301f4bc0f53389cca831ee04 (patch) | |
tree | 97fa9c758f429d5dee64234e442f2c83cd1b9994 /OpenSim/Services/Connectors | |
parent | Merge branch 'careminster-presence-refactor' into bigmerge (diff) | |
parent | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge (diff) | |
download | opensim-SC_OLD-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.zip opensim-SC_OLD-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.gz opensim-SC_OLD-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.bz2 opensim-SC_OLD-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.xz |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/EstateDataService.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs index 7184ba1..cdcdecf 100644 --- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs +++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -90,6 +90,11 @@ namespace OpenSim.Services.Connectors | |||
90 | { | 90 | { |
91 | return m_database.LoadEstateSettings(estateID); | 91 | return m_database.LoadEstateSettings(estateID); |
92 | } | 92 | } |
93 | |||
94 | public EstateSettings CreateNewEstate() | ||
95 | { | ||
96 | return m_database.CreateNewEstate(); | ||
97 | } | ||
93 | 98 | ||
94 | public List<EstateSettings> LoadEstateSettingsAll() | 99 | public List<EstateSettings> LoadEstateSettingsAll() |
95 | { | 100 | { |