aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-03-21 21:37:06 +0000
committerJustin Clark-Casey (justincc)2011-03-21 21:37:06 +0000
commitd3a20a1e9257ecec417e219ebaf079370015f06d (patch)
tree98a737503fde948d8e827527c03ea443aff46c9e /OpenSim/Region
parentUpgrade SQLite: (diff)
downloadopensim-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 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs13
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEstateDataService.cs14
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs14
3 files changed, 40 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index e950613..f804cb7 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -828,7 +828,18 @@ namespace OpenSim
828 } 828 }
829 else 829 else
830 { 830 {
831 response = MainConsole.Instance.CmdPrompt("Estate name to join", "None"); 831 List<EstateSettings> estates = estateDataService.LoadEstateSettingsAll();
832
833 List<string> estateNames = new List<string>();
834 foreach (EstateSettings estate in estates)
835 estateNames.Add(estate.EstateName);
836
837 response
838 = MainConsole.Instance.CmdPrompt(
839 string.Format(
840 "Name of estate to join. Existing estate names are ({0})", string.Join(", ", estateNames.ToArray())),
841 "None");
842
832 if (response == "None") 843 if (response == "None")
833 continue; 844 continue;
834 845
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateDataService.cs b/OpenSim/Region/Framework/Interfaces/IEstateDataService.cs
index 95c9659..12ed9e3 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateDataService.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateDataService.cs
@@ -36,8 +36,22 @@ namespace OpenSim.Region.Framework.Interfaces
36 { 36 {
37 EstateSettings LoadEstateSettings(UUID regionID, bool create); 37 EstateSettings LoadEstateSettings(UUID regionID, bool create);
38 EstateSettings LoadEstateSettings(int estateID); 38 EstateSettings LoadEstateSettings(int estateID);
39
40 /// <summary>
41 /// Load/Get all estate settings.
42 /// </summary>
43 /// <returns>An empty list if no estates were found.</returns>
44 List<EstateSettings> LoadEstateSettingsAll();
45
39 void StoreEstateSettings(EstateSettings es); 46 void StoreEstateSettings(EstateSettings es);
40 List<int> GetEstates(string search); 47 List<int> GetEstates(string search);
48
49 /// <summary>
50 /// Get the IDs of all estates.
51 /// </summary>
52 /// <returns>An empty list if no estates were found.</returns>
53 List<int> GetEstatesAll();
54
41 bool LinkRegion(UUID regionID, int estateID); 55 bool LinkRegion(UUID regionID, int estateID);
42 List<UUID> GetRegions(int estateID); 56 List<UUID> GetRegions(int estateID);
43 bool DeleteEstate(int estateID); 57 bool DeleteEstate(int estateID);
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
index 87c7a05..d78ad78 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
@@ -37,8 +37,22 @@ namespace OpenSim.Region.Framework.Interfaces
37 37
38 EstateSettings LoadEstateSettings(UUID regionID, bool create); 38 EstateSettings LoadEstateSettings(UUID regionID, bool create);
39 EstateSettings LoadEstateSettings(int estateID); 39 EstateSettings LoadEstateSettings(int estateID);
40
41 /// <summary>
42 /// Load/Get all estate settings.
43 /// </summary>
44 /// <returns>An empty list if no estates were found.</returns>
45 List<EstateSettings> LoadEstateSettingsAll();
46
40 void StoreEstateSettings(EstateSettings es); 47 void StoreEstateSettings(EstateSettings es);
41 List<int> GetEstates(string search); 48 List<int> GetEstates(string search);
49
50 /// <summary>
51 /// Get the IDs of all estates.
52 /// </summary>
53 /// <returns>An empty list if no estates were found.</returns>
54 List<int> GetEstatesAll();
55
42 bool LinkRegion(UUID regionID, int estateID); 56 bool LinkRegion(UUID regionID, int estateID);
43 List<UUID> GetRegions(int estateID); 57 List<UUID> GetRegions(int estateID);
44 bool DeleteEstate(int estateID); 58 bool DeleteEstate(int estateID);