From 5a413c1b2f5cbb3567126c09ba7d596cbd3c0739 Mon Sep 17 00:00:00 2001
From: Freaky Tech <ft@noemail>
Date: Thu, 5 Mar 2015 23:14:19 +0100
Subject: [PATCH] adjusted new UserManagementModule to accept the HG UUI test
 harness

Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
---
 .../Framework/UserManagement/UserManagementModule.cs        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index d3d124654d..ba71dc5698 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
 
             if (!userdata.HasGridUserTried)
             {
-                GridUserInfo uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString());
+                GridUserInfo uInfo = null;
+                if (null != m_Scenes[0].GridUserService)
+                {
+                    uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString());
+                }
                 if (uInfo != null)
                 {
                     string url, first, last, tmp;