diff options
author | Justin Clark-Casey (justincc) | 2011-03-21 21:37:06 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-03-21 21:37:06 +0000 |
commit | d3a20a1e9257ecec417e219ebaf079370015f06d (patch) | |
tree | 98a737503fde948d8e827527c03ea443aff46c9e /OpenSim/Services/Connectors/Simulation | |
parent | Upgrade SQLite: (diff) | |
download | opensim-SC_OLD-d3a20a1e9257ecec417e219ebaf079370015f06d.zip opensim-SC_OLD-d3a20a1e9257ecec417e219ebaf079370015f06d.tar.gz opensim-SC_OLD-d3a20a1e9257ecec417e219ebaf079370015f06d.tar.bz2 opensim-SC_OLD-d3a20a1e9257ecec417e219ebaf079370015f06d.tar.xz |
On initial region registration, if the user chooses the option to make the region part of an existing estate, then list the existing region names.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/EstateDataService.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs index b6df5a2..d0588bf 100644 --- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs +++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs | |||
@@ -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 List<EstateSettings> LoadEstateSettingsAll() | ||
95 | { | ||
96 | return m_database.LoadEstateSettingsAll(); | ||
97 | } | ||
93 | 98 | ||
94 | public void StoreEstateSettings(EstateSettings es) | 99 | public void StoreEstateSettings(EstateSettings es) |
95 | { | 100 | { |
@@ -100,6 +105,11 @@ namespace OpenSim.Services.Connectors | |||
100 | { | 105 | { |
101 | return m_database.GetEstates(search); | 106 | return m_database.GetEstates(search); |
102 | } | 107 | } |
108 | |||
109 | public List<int> GetEstatesAll() | ||
110 | { | ||
111 | return m_database.GetEstatesAll(); | ||
112 | } | ||
103 | 113 | ||
104 | public bool LinkRegion(UUID regionID, int estateID) | 114 | public bool LinkRegion(UUID regionID, int estateID) |
105 | { | 115 | { |