aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMic Bowman2011-04-04 20:04:01 -0700
committerMic Bowman2011-04-04 20:04:01 -0700
commitd5e0674213dc9ca8fb038d2305e1ff5873b6363d (patch)
treec101a124fe3b81d4236a5f80589593d6afcb9a23 /OpenSim/Services
parentUpdates NullStorage plugin. (diff)
parentMake the "All Estates" option work from the client (this makes chosen changes... (diff)
downloadopensim-SC_OLD-d5e0674213dc9ca8fb038d2305e1ff5873b6363d.zip
opensim-SC_OLD-d5e0674213dc9ca8fb038d2305e1ff5873b6363d.tar.gz
opensim-SC_OLD-d5e0674213dc9ca8fb038d2305e1ff5873b6363d.tar.bz2
opensim-SC_OLD-d5e0674213dc9ca8fb038d2305e1ff5873b6363d.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Simulation/EstateDataService.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
index d0588bf..7184ba1 100644
--- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
@@ -111,6 +111,11 @@ namespace OpenSim.Services.Connectors
111 return m_database.GetEstatesAll(); 111 return m_database.GetEstatesAll();
112 } 112 }
113 113
114 public List<int> GetEstatesByOwner(UUID ownerID)
115 {
116 return m_database.GetEstatesByOwner(ownerID);
117 }
118
114 public bool LinkRegion(UUID regionID, int estateID) 119 public bool LinkRegion(UUID regionID, int estateID)
115 { 120 {
116 return m_database.LinkRegion(regionID, estateID); 121 return m_database.LinkRegion(regionID, estateID);