aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/UserAccountService/UserAccountService.cs
diff options
context:
space:
mode:
authorMelanie Thielker2010-04-30 23:32:58 +0200
committerMelanie Thielker2010-04-30 23:32:58 +0200
commit881fcb7def0ef1ff81c6de10137abcdca8bc7679 (patch)
tree8fb8b7b9f6fe334fa6b54dbeacb8730408fef238 /OpenSim/Services/UserAccountService/UserAccountService.cs
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-881fcb7def0ef1ff81c6de10137abcdca8bc7679.zip
opensim-SC_OLD-881fcb7def0ef1ff81c6de10137abcdca8bc7679.tar.gz
opensim-SC_OLD-881fcb7def0ef1ff81c6de10137abcdca8bc7679.tar.bz2
opensim-SC_OLD-881fcb7def0ef1ff81c6de10137abcdca8bc7679.tar.xz
Allow retrieval if admin users in scope mode
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/UserAccountService/UserAccountService.cs18
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 7b38aa6..35e2826 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -104,6 +104,12 @@ namespace OpenSim.Services.UserAccountService
104 d = m_Database.Get( 104 d = m_Database.Get(
105 new string[] { "ScopeID", "FirstName", "LastName" }, 105 new string[] { "ScopeID", "FirstName", "LastName" },
106 new string[] { scopeID.ToString(), firstName, lastName }); 106 new string[] { scopeID.ToString(), firstName, lastName });
107 if (d.Length < 1)
108 {
109 d = m_Database.Get(
110 new string[] { "ScopeID", "FirstName", "LastName" },
111 new string[] { UUID.Zero.ToString(), firstName, lastName });
112 }
107 } 113 }
108 else 114 else
109 { 115 {
@@ -172,6 +178,12 @@ namespace OpenSim.Services.UserAccountService
172 d = m_Database.Get( 178 d = m_Database.Get(
173 new string[] { "ScopeID", "Email" }, 179 new string[] { "ScopeID", "Email" },
174 new string[] { scopeID.ToString(), email }); 180 new string[] { scopeID.ToString(), email });
181 if (d.Length < 1)
182 {
183 d = m_Database.Get(
184 new string[] { "ScopeID", "Email" },
185 new string[] { UUID.Zero.ToString(), email });
186 }
175 } 187 }
176 else 188 else
177 { 189 {
@@ -195,6 +207,12 @@ namespace OpenSim.Services.UserAccountService
195 d = m_Database.Get( 207 d = m_Database.Get(
196 new string[] { "ScopeID", "PrincipalID" }, 208 new string[] { "ScopeID", "PrincipalID" },
197 new string[] { scopeID.ToString(), principalID.ToString() }); 209 new string[] { scopeID.ToString(), principalID.ToString() });
210 if (d.Length < 1)
211 {
212 d = m_Database.Get(
213 new string[] { "ScopeID", "PrincipalID" },
214 new string[] { UUID.Zero.ToString(), principalID.ToString() });
215 }
198 } 216 }
199 else 217 else
200 { 218 {