diff options
| author | Melanie | 2011-10-11 21:30:42 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 21:30:42 +0100 |
| commit | 673886d2311ad9873f386ca794f5e1adf41755be (patch) | |
| tree | a55c40204c3a351db5d2d86e6c3369ac71c40385 /OpenSim/Services | |
| parent | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmerge (diff) | |
| parent | Reattaching a region was failing if the estate name had not changed (issue 50... (diff) | |
| download | opensim-SC-673886d2311ad9873f386ca794f5e1adf41755be.zip opensim-SC-673886d2311ad9873f386ca794f5e1adf41755be.tar.gz opensim-SC-673886d2311ad9873f386ca794f5e1adf41755be.tar.bz2 opensim-SC-673886d2311ad9873f386ca794f5e1adf41755be.tar.xz | |
Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge
Diffstat (limited to 'OpenSim/Services')
| -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 | { |