diff options
author | Sean Dague | 2008-05-16 18:40:16 +0000 |
---|---|---|
committer | Sean Dague | 2008-05-16 18:40:16 +0000 |
commit | 843be1e93dd13f5ffeb26fa7533204bb4fea5bb8 (patch) | |
tree | c7e5b3d9bb3cfa3362887e72707f68002d73ff53 | |
parent | in theory implement the backend of appearance for grid. (diff) | |
download | opensim-SC-843be1e93dd13f5ffeb26fa7533204bb4fea5bb8.zip opensim-SC-843be1e93dd13f5ffeb26fa7533204bb4fea5bb8.tar.gz opensim-SC-843be1e93dd13f5ffeb26fa7533204bb4fea5bb8.tar.bz2 opensim-SC-843be1e93dd13f5ffeb26fa7533204bb4fea5bb8.tar.xz |
some more wrapping of errors in user service on appearance for
safety
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 8c47323..2c97fd7 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | |||
@@ -89,20 +89,26 @@ namespace OpenSim.Region.Communications.OGS1 | |||
89 | 89 | ||
90 | public AvatarAppearance ConvertXMLRPCDataToAvatarAppearance(Hashtable data) | 90 | public AvatarAppearance ConvertXMLRPCDataToAvatarAppearance(Hashtable data) |
91 | { | 91 | { |
92 | if (data.Contains("error_type")) | 92 | if (data != null) |
93 | { | 93 | { |
94 | m_log.Warn("[GRID]: " + | 94 | if (data.Contains("error_type")) |
95 | "Error sent by user server when trying to get user appearance: (" + | 95 | { |
96 | data["error_type"] + | 96 | m_log.Warn("[GRID]: " + |
97 | "): " + data["error_desc"]); | 97 | "Error sent by user server when trying to get user appearance: (" + |
98 | return null; | 98 | data["error_type"] + |
99 | "): " + data["error_desc"]); | ||
100 | return new AvatarAppearance(); | ||
101 | } | ||
102 | else | ||
103 | { | ||
104 | return new AvatarAppearance(data); | ||
105 | } | ||
99 | } | 106 | } |
100 | else | 107 | else |
101 | { | 108 | { |
102 | return new AvatarAppearance(data); | 109 | m_log.Error("[GRID]: The avatar appearance is null, something bad happenend"); |
110 | return new AvatarAppearance(); | ||
103 | } | 111 | } |
104 | |||
105 | return null; | ||
106 | } | 112 | } |
107 | 113 | ||
108 | public List<AvatarPickerAvatar> ConvertXMLRPCDataToAvatarPickerList(LLUUID queryID, Hashtable data) | 114 | public List<AvatarPickerAvatar> ConvertXMLRPCDataToAvatarPickerList(LLUUID queryID, Hashtable data) |