aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2010-01-03 07:03:14 -0800
committerDiva Canto2010-01-03 07:03:14 -0800
commitae1bdaa7b5f4bf485a52c2fcd81be2e1cd8d0400 (patch)
tree25e1864ccee876daa6461672252b74ad9a78277f /OpenSim
parentTest client for remote user account connector and service. It seems to be wor... (diff)
downloadopensim-SC_OLD-ae1bdaa7b5f4bf485a52c2fcd81be2e1cd8d0400.zip
opensim-SC_OLD-ae1bdaa7b5f4bf485a52c2fcd81be2e1cd8d0400.tar.gz
opensim-SC_OLD-ae1bdaa7b5f4bf485a52c2fcd81be2e1cd8d0400.tar.bz2
opensim-SC_OLD-ae1bdaa7b5f4bf485a52c2fcd81be2e1cd8d0400.tar.xz
Applied fix for avatar connectors similar to yesterday's fix of user account connectors.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs9
-rw-r--r--OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs7
2 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
index c781cce..49c2e43 100644
--- a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
@@ -138,12 +138,9 @@ namespace OpenSim.Server.Handlers.Avatar
138 if (!UUID.TryParse(request["UserID"].ToString(), out user)) 138 if (!UUID.TryParse(request["UserID"].ToString(), out user))
139 return FailureResult(); 139 return FailureResult();
140 140
141 if (request.ContainsKey("Avatar") && request["Avatar"] is Dictionary<string, object>) 141 AvatarData avatar = new AvatarData(request);
142 { 142 if (m_AvatarService.SetAvatar(user, avatar))
143 AvatarData avatar = new AvatarData((Dictionary<string, object>)request["Avatar"]); 143 return SuccessResult();
144 if (m_AvatarService.SetAvatar(user, avatar))
145 return SuccessResult();
146 }
147 144
148 return FailureResult(); 145 return FailureResult();
149 } 146 }
diff --git a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs b/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
index bd78c1a..6d9fc60 100644
--- a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
@@ -140,7 +140,12 @@ namespace OpenSim.Services.Connectors
140 sendData["METHOD"] = "setavatar"; 140 sendData["METHOD"] = "setavatar";
141 141
142 sendData["UserID"] = userID.ToString(); 142 sendData["UserID"] = userID.ToString();
143 sendData["Avatar"] = avatar.ToKeyValuePairs(); 143
144 Dictionary<string, object> structData = avatar.ToKeyValuePairs();
145
146 foreach (KeyValuePair<string, object> kvp in structData)
147 sendData[kvp.Key] = kvp.Value.ToString();
148
144 149
145 string reqString = ServerUtils.BuildQueryString(sendData); 150 string reqString = ServerUtils.BuildQueryString(sendData);
146 // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString); 151 // m_log.DebugFormat("[AVATAR CONNECTOR]: queryString = {0}", reqString);