diff options
| author | Freaky Tech | 2015-03-05 23:14:19 +0100 |
|---|---|---|
| committer | BlueWall | 2015-03-05 17:19:39 -0500 |
| commit | 5a413c1b2f5cbb3567126c09ba7d596cbd3c0739 (patch) | |
| tree | 5e4011358cf0d962bf6eff611f70eba08f822797 | |
| parent | Give llGiveInventory a way to querry Hypergrid visitors so network vendors ar... (diff) | |
| download | opensim-SC_OLD-5a413c1b2f5cbb3567126c09ba7d596cbd3c0739.zip opensim-SC_OLD-5a413c1b2f5cbb3567126c09ba7d596cbd3c0739.tar.gz opensim-SC_OLD-5a413c1b2f5cbb3567126c09ba7d596cbd3c0739.tar.bz2 opensim-SC_OLD-5a413c1b2f5cbb3567126c09ba7d596cbd3c0739.tar.xz | |
adjusted new UserManagementModule to accept the HG UUI test harness
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index d3d1246..ba71dc5 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
| @@ -500,7 +500,11 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
| 500 | 500 | ||
| 501 | if (!userdata.HasGridUserTried) | 501 | if (!userdata.HasGridUserTried) |
| 502 | { | 502 | { |
| 503 | GridUserInfo uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString()); | 503 | GridUserInfo uInfo = null; |
| 504 | if (null != m_Scenes[0].GridUserService) | ||
| 505 | { | ||
| 506 | uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString()); | ||
| 507 | } | ||
| 504 | if (uInfo != null) | 508 | if (uInfo != null) |
| 505 | { | 509 | { |
| 506 | string url, first, last, tmp; | 510 | string url, first, last, tmp; |