diff options
author | Jeff Ames | 2007-12-04 22:14:53 +0000 |
---|---|---|
committer | Jeff Ames | 2007-12-04 22:14:53 +0000 |
commit | f195725db447aad7595810a9950f656163bf1c13 (patch) | |
tree | 2d62dbd3635b008e9c41c2645fc71a6abbcc0a26 /OpenSim/Region/Communications/OGS1 | |
parent | made log messages for known unhandled packet types shorter and yellower. add... (diff) | |
download | opensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.zip opensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.tar.gz opensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.tar.bz2 opensim-SC_OLD-f195725db447aad7595810a9950f656163bf1c13.tar.xz |
keeping opensim safe for children -- made some namespace references less explicit
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index ed77e20..d26da90 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | |||
@@ -50,8 +50,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
50 | { | 50 | { |
51 | if (data.Contains("error_type")) | 51 | if (data.Contains("error_type")) |
52 | { | 52 | { |
53 | OpenSim.Framework.Console.MainLog.Instance.Warn("GRID", "Error sent by user server when trying to get user profile: (" + data["error_type"] + | 53 | MainLog.Instance.Warn("GRID", "Error sent by user server when trying to get user profile: (" + data["error_type"] + |
54 | "): " + data["error_desc"]); | 54 | "): " + data["error_desc"]); |
55 | return null; | 55 | return null; |
56 | } | 56 | } |
57 | 57 | ||
@@ -104,16 +104,13 @@ namespace OpenSim.Region.Communications.OGS1 | |||
104 | MainLog.Instance.Warn("INTERGRID", "Got invalid queryID from userServer"); | 104 | MainLog.Instance.Warn("INTERGRID", "Got invalid queryID from userServer"); |
105 | } | 105 | } |
106 | return pickerlist; | 106 | return pickerlist; |
107 | |||
108 | } | 107 | } |
109 | 108 | ||
110 | |||
111 | public UserProfileData GetUserProfile(string firstName, string lastName) | 109 | public UserProfileData GetUserProfile(string firstName, string lastName) |
112 | { | 110 | { |
113 | return GetUserProfile(firstName + " " + lastName); | 111 | return GetUserProfile(firstName + " " + lastName); |
114 | } | 112 | } |
115 | 113 | ||
116 | |||
117 | public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) | 114 | public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) |
118 | { | 115 | { |
119 | List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>(); | 116 | List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>(); |
@@ -138,6 +135,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
138 | } | 135 | } |
139 | return pickerlist; | 136 | return pickerlist; |
140 | } | 137 | } |
138 | |||
141 | public UserProfileData GetUserProfile(string name) | 139 | public UserProfileData GetUserProfile(string name) |
142 | { | 140 | { |
143 | try | 141 | try |
@@ -213,4 +211,4 @@ namespace OpenSim.Region.Communications.OGS1 | |||
213 | throw new Exception("The method or operation is not implemented."); | 211 | throw new Exception("The method or operation is not implemented."); |
214 | } | 212 | } |
215 | } | 213 | } |
216 | } \ No newline at end of file | 214 | } |