aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authormingchen2007-07-15 21:21:14 +0000
committermingchen2007-07-15 21:21:14 +0000
commit173c5ee79eb167c929fef9da05d984541775915f (patch)
tree3f3096ce212d1abe8c7ef46b71fcff1d51e50c1a
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.
-rw-r--r--OpenSim/Framework/UserManager/UserManagerBase.cs5
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs6
2 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index df6fbb2..4e688f7 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -119,6 +119,7 @@ namespace OpenSim.Framework.UserManagement
119 } 119 }
120 catch (Exception e) 120 catch (Exception e)
121 { 121 {
122 System.Console.WriteLine("EEK!");
122 MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 123 MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
123 } 124 }
124 } 125 }
@@ -575,6 +576,7 @@ namespace OpenSim.Framework.UserManagement
575 responseData["home_look_y"] = profile.homeLookAt.Y.ToString(); 576 responseData["home_look_y"] = profile.homeLookAt.Y.ToString();
576 responseData["home_look_z"] = profile.homeLookAt.Z.ToString(); 577 responseData["home_look_z"] = profile.homeLookAt.Z.ToString();
577 response.Value = responseData; 578 response.Value = responseData;
579
578 return response; 580 return response;
579 } 581 }
580 582
@@ -585,7 +587,6 @@ namespace OpenSim.Framework.UserManagement
585 XmlRpcResponse response = new XmlRpcResponse(); 587 XmlRpcResponse response = new XmlRpcResponse();
586 Hashtable requestData = (Hashtable)request.Params[0]; 588 Hashtable requestData = (Hashtable)request.Params[0];
587 UserProfileData userProfile; 589 UserProfileData userProfile;
588
589 if (requestData.Contains("avatar_name")) 590 if (requestData.Contains("avatar_name"))
590 { 591 {
591 userProfile = getUserProfile((string)requestData["avatar_name"]); 592 userProfile = getUserProfile((string)requestData["avatar_name"]);
@@ -598,7 +599,6 @@ namespace OpenSim.Framework.UserManagement
598 { 599 {
599 return CreateUnknownUserErrorResponse(); 600 return CreateUnknownUserErrorResponse();
600 } 601 }
601
602 602
603 return ProfileToXmlRPCResponse(userProfile); 603 return ProfileToXmlRPCResponse(userProfile);
604 } 604 }
@@ -608,6 +608,7 @@ namespace OpenSim.Framework.UserManagement
608 XmlRpcResponse response = new XmlRpcResponse(); 608 XmlRpcResponse response = new XmlRpcResponse();
609 Hashtable requestData = (Hashtable)request.Params[0]; 609 Hashtable requestData = (Hashtable)request.Params[0];
610 UserProfileData userProfile; 610 UserProfileData userProfile;
611 System.Console.WriteLine("METHOD BY UUID CALLED");
611 if (requestData.Contains("avatar_uuid")) 612 if (requestData.Contains("avatar_uuid"))
612 { 613 {
613 userProfile = getUserProfile((LLUUID)requestData["avatar_uuid"]); 614 userProfile = getUserProfile((LLUUID)requestData["avatar_uuid"]);
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}