OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow retrieval if admin users in scope mode

avinationmerge
Melanie Thielker 2010-04-30 23:32:58 +02:00
parent 9bc5098dd8
commit 881fcb7def
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Services/UserAccountService/UserAccountService.cs
View File

@ -104,6 +104,12 @@ namespace OpenSim.Services.UserAccountService
d = m_Database.Get( d = m_Database.Get(
new string[] { "ScopeID", "FirstName", "LastName" }, new string[] { "ScopeID", "FirstName", "LastName" },
new string[] { scopeID.ToString(), firstName, lastName }); new string[] { scopeID.ToString(), firstName, lastName });
if (d.Length < 1)
{
d = m_Database.Get(
new string[] { "ScopeID", "FirstName", "LastName" },
new string[] { UUID.Zero.ToString(), firstName, lastName });
}
} }
else else
{ {
@ -172,6 +178,12 @@ namespace OpenSim.Services.UserAccountService
d = m_Database.Get( d = m_Database.Get(
new string[] { "ScopeID", "Email" }, new string[] { "ScopeID", "Email" },
new string[] { scopeID.ToString(), email }); new string[] { scopeID.ToString(), email });
if (d.Length < 1)
{
d = m_Database.Get(
new string[] { "ScopeID", "Email" },
new string[] { UUID.Zero.ToString(), email });
}
} }
else else
{ {
@ -195,6 +207,12 @@ namespace OpenSim.Services.UserAccountService
d = m_Database.Get( d = m_Database.Get(
new string[] { "ScopeID", "PrincipalID" }, new string[] { "ScopeID", "PrincipalID" },
new string[] { scopeID.ToString(), principalID.ToString() }); new string[] { scopeID.ToString(), principalID.ToString() });
if (d.Length < 1)
{
d = m_Database.Get(
new string[] { "ScopeID", "PrincipalID" },
new string[] { UUID.Zero.ToString(), principalID.ToString() });
}
} }
else else
{ {