aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authormingchen2007-07-15 21:21:14 +0000
committermingchen2007-07-15 21:21:14 +0000
commit173c5ee79eb167c929fef9da05d984541775915f (patch)
tree3f3096ce212d1abe8c7ef46b71fcff1d51e50c1a /OpenSim/Region/Communications
parentHijacked simpleApp again (sorry lbsa71, guess I should create my own simpleAp... (diff)
downloadopensim-SC_OLD-173c5ee79eb167c929fef9da05d984541775915f.zip
opensim-SC_OLD-173c5ee79eb167c929fef9da05d984541775915f.tar.gz
opensim-SC_OLD-173c5ee79eb167c929fef9da05d984541775915f.tar.bz2
opensim-SC_OLD-173c5ee79eb167c929fef9da05d984541775915f.tar.xz
*Fixed master avatar requesting when in grid mode.
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs6
1 files changed, 1 insertions, 5 deletions
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
95 public UserProfileData SetupMasterUser(string firstName, string lastName, string password) 95 public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
96 { 96 {
97 UserProfileData profile = GetUserProfile(firstName, lastName); 97 UserProfileData profile = GetUserProfile(firstName, lastName);
98 if (profile == null) 98 return profile;
99 {
100 Console.WriteLine("Unknown Master User. Grid Mode: No clue what I should do. Probably would choose the grid owner UUID when that is implemented");
101 }
102 return null;
103 } 99 }
104 } 100 }
105} 101}