diff options
| author | Melanie | 2009-12-30 22:44:04 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-30 22:44:04 +0000 |
| commit | 96f387ce491e033344f6097dcaf9852fc6309aed (patch) | |
| tree | 281d7f4e0be449b9bc5ebf98538e84330a8d8a5a | |
| parent | Merge branch 'master' into presence-refactor (diff) | |
| download | opensim-SC_OLD-96f387ce491e033344f6097dcaf9852fc6309aed.zip opensim-SC_OLD-96f387ce491e033344f6097dcaf9852fc6309aed.tar.gz opensim-SC_OLD-96f387ce491e033344f6097dcaf9852fc6309aed.tar.bz2 opensim-SC_OLD-96f387ce491e033344f6097dcaf9852fc6309aed.tar.xz | |
Make ScopeID be wild on user queries. Just pass it as UUID.Zero
| -rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index ee9ea94..0270f9d 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
| @@ -44,9 +44,20 @@ namespace OpenSim.Services.UserAccountService | |||
| 44 | public UserAccount GetUserAccount(UUID scopeID, string firstName, | 44 | public UserAccount GetUserAccount(UUID scopeID, string firstName, |
| 45 | string lastName) | 45 | string lastName) |
| 46 | { | 46 | { |
| 47 | UserAccountData[] d = m_Database.Get( | 47 | UserAccountData[] d; |
| 48 | new string[] {"ScopeID", "FirstName", "LastName"}, | 48 | |
| 49 | new string[] {scopeID.ToString(), firstName, lastName}); | 49 | if (scopeID != UUID.Zero) |
| 50 | { | ||
| 51 | d = m_Database.Get( | ||
| 52 | new string[] {"ScopeID", "FirstName", "LastName"}, | ||
| 53 | new string[] {scopeID.ToString(), firstName, lastName}); | ||
| 54 | } | ||
| 55 | else | ||
| 56 | { | ||
| 57 | d = m_Database.Get( | ||
| 58 | new string[] {"FirstName", "LastName"}, | ||
| 59 | new string[] {firstName, lastName}); | ||
| 60 | } | ||
| 50 | 61 | ||
| 51 | if (d.Length < 1) | 62 | if (d.Length < 1) |
| 52 | return null; | 63 | return null; |