diff options
author | mingchen | 2007-07-15 21:21:14 +0000 |
---|---|---|
committer | mingchen | 2007-07-15 21:21:14 +0000 |
commit | 173c5ee79eb167c929fef9da05d984541775915f (patch) | |
tree | 3f3096ce212d1abe8c7ef46b71fcff1d51e50c1a /OpenSim/Framework | |
parent | Hijacked simpleApp again (sorry lbsa71, guess I should create my own simpleAp... (diff) | |
download | opensim-SC-173c5ee79eb167c929fef9da05d984541775915f.zip opensim-SC-173c5ee79eb167c929fef9da05d984541775915f.tar.gz opensim-SC-173c5ee79eb167c929fef9da05d984541775915f.tar.bz2 opensim-SC-173c5ee79eb167c929fef9da05d984541775915f.tar.xz |
*Fixed master avatar requesting when in grid mode.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/UserManager/UserManagerBase.cs | 5 |
1 files changed, 3 insertions, 2 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"]); |