From d0accc073272af838bc4ba44a71d41b19aa05906 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Fri, 30 Apr 2010 23:32:58 +0200
Subject: [PATCH] Allow retrieval if admin users in scope mode

---
 .../UserAccountService/UserAccountService.cs   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 7b38aa69f9..35e2826a71 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -104,6 +104,12 @@ namespace OpenSim.Services.UserAccountService
                 d = m_Database.Get(
                         new string[] { "ScopeID", "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
             {
@@ -172,6 +178,12 @@ namespace OpenSim.Services.UserAccountService
                 d = m_Database.Get(
                         new string[] { "ScopeID", "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
             {
@@ -195,6 +207,12 @@ namespace OpenSim.Services.UserAccountService
                 d = m_Database.Get(
                         new string[] { "ScopeID", "PrincipalID" },
                         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
             {