diff options
author | UbitUmarov | 2016-08-13 23:41:57 +0100 |
---|---|---|
committer | UbitUmarov | 2016-08-13 23:41:57 +0100 |
commit | 1337f5f26e628dc7c5d038ffee5e957d95a72566 (patch) | |
tree | e022d04db0e0174ade41f0c497651f5ff2115c03 /OpenSim/Services/Connectors | |
parent | add some wiring to have GetUserAccounts for multiple IDs on a single request... (diff) | |
download | opensim-SC_OLD-1337f5f26e628dc7c5d038ffee5e957d95a72566.zip opensim-SC_OLD-1337f5f26e628dc7c5d038ffee5e957d95a72566.tar.gz opensim-SC_OLD-1337f5f26e628dc7c5d038ffee5e957d95a72566.tar.bz2 opensim-SC_OLD-1337f5f26e628dc7c5d038ffee5e957d95a72566.tar.xz |
remove a parameter for detection of grid fail to suport getting multiple user accounts per call and handle it where needed.
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | 3 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs | 22 |
2 files changed, 22 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs index 1ef5ad2..6f613c1 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs | |||
@@ -201,9 +201,8 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
201 | return null; | 201 | return null; |
202 | } | 202 | } |
203 | 203 | ||
204 | public List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs, out bool suported) | 204 | public List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs) |
205 | { | 205 | { |
206 | suported = false; | ||
207 | return null; | 206 | return null; |
208 | } | 207 | } |
209 | 208 | ||
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs index e625143..5bc7a1c 100644 --- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs +++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs | |||
@@ -191,7 +191,27 @@ namespace OpenSim.Services.Connectors | |||
191 | return accounts; | 191 | return accounts; |
192 | } | 192 | } |
193 | 193 | ||
194 | public virtual List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs, out bool suported) | 194 | public virtual List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs) |
195 | { | ||
196 | List<UserAccount> accs = new List<UserAccount>(); | ||
197 | bool multisuported = true; | ||
198 | accs = doGetMultiUserAccounts(scopeID, IDs, out multisuported); | ||
199 | if(multisuported) | ||
200 | return accs; | ||
201 | |||
202 | // service does not do multi accounts so need to do it one by one | ||
203 | |||
204 | UUID uuid = UUID.Zero; | ||
205 | foreach(string id in IDs) | ||
206 | { | ||
207 | if(UUID.TryParse(id, out uuid) && uuid != UUID.Zero) | ||
208 | accs.Add(GetUserAccount(scopeID,uuid)); | ||
209 | } | ||
210 | |||
211 | return accs; | ||
212 | } | ||
213 | |||
214 | private List<UserAccount> doGetMultiUserAccounts(UUID scopeID, List<string> IDs, out bool suported) | ||
195 | { | 215 | { |
196 | suported = true; | 216 | suported = true; |
197 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 217 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |