From 173c5ee79eb167c929fef9da05d984541775915f Mon Sep 17 00:00:00 2001
From: mingchen
Date: Sun, 15 Jul 2007 21:21:14 +0000
Subject: *Fixed master avatar requesting when in grid mode.

---
 OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'OpenSim/Region/Communications/OGS1')

diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 2bbaf9d..46d71c4 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -95,11 +95,7 @@ namespace OpenSim.Region.Communications.OGS1
         public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
         {
             UserProfileData profile = GetUserProfile(firstName, lastName);
-            if (profile == null)
-            {
-                Console.WriteLine("Unknown Master User. Grid Mode: No clue what I should do. Probably would choose the grid owner UUID when that is implemented");
-            }
-            return null;
+            return profile;
         }
     }
 }
-- 
cgit v1.1