diff options
author | Melanie | 2011-04-06 09:22:55 +0100 |
---|---|---|
committer | Melanie | 2011-04-06 09:22:55 +0100 |
commit | 407c2b182303d3bc1214e71f407bddc28c671a55 (patch) | |
tree | e9658864b8dcad3c2dced73e97b505941576de9b /OpenSim/Services | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Change some text to make the autoreturn mechanism more obvious, and align wit... (diff) | |
download | opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.zip opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.tar.gz opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.tar.bz2 opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/EstateDataService.cs | 5 |
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); |