aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts
diff options
context:
space:
mode:
authorUbitUmarov2016-08-13 23:41:57 +0100
committerUbitUmarov2016-08-13 23:41:57 +0100
commit1337f5f26e628dc7c5d038ffee5e957d95a72566 (patch)
treee022d04db0e0174ade41f0c497651f5ff2115c03 /OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts
parent add some wiring to have GetUserAccounts for multiple IDs on a single request... (diff)
downloadopensim-SC-1337f5f26e628dc7c5d038ffee5e957d95a72566.zip
opensim-SC-1337f5f26e628dc7c5d038ffee5e957d95a72566.tar.gz
opensim-SC-1337f5f26e628dc7c5d038ffee5e957d95a72566.tar.bz2
opensim-SC-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/Region/CoreModules/ServiceConnectorsOut/UserAccounts')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs4
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs8
2 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
index 1002b85..1bb4704 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
@@ -182,9 +182,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
182 return UserAccountService.GetUserAccount(scopeID, Email); 182 return UserAccountService.GetUserAccount(scopeID, Email);
183 } 183 }
184 184
185 public List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs, out bool suported) 185 public List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs)
186 { 186 {
187 return UserAccountService.GetUserAccounts(scopeID, IDs, out suported); 187 return UserAccountService.GetUserAccounts(scopeID, IDs);
188 } 188 }
189 189
190 190
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
index fb5fae1..ce1754f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
@@ -160,9 +160,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
160 return account; 160 return account;
161 } 161 }
162 162
163 public override List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs, out bool suported) 163 public override List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs)
164 { 164 {
165 suported = true;
166 List<UserAccount> accs = new List<UserAccount>(); 165 List<UserAccount> accs = new List<UserAccount>();
167 List<string> missing = new List<string>(); 166 List<string> missing = new List<string>();
168 167
@@ -184,15 +183,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
184 183
185 if(missing.Count > 0) 184 if(missing.Count > 0)
186 { 185 {
187 List<UserAccount> ext = base.GetUserAccounts(scopeID, missing, out suported); 186 List<UserAccount> ext = base.GetUserAccounts(scopeID, missing);
188 if(suported && ext != null) 187 if(ext != null)
189 accs.AddRange(ext); 188 accs.AddRange(ext);
190 } 189 }
191 190
192 return accs; 191 return accs;
193 } 192 }
194 193
195
196 public override bool StoreUserAccount(UserAccount data) 194 public override bool StoreUserAccount(UserAccount data)
197 { 195 {
198 // This remote connector refuses to serve this method 196 // This remote connector refuses to serve this method