aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorOren Hurvitz2013-10-31 09:00:59 +0200
committerOren Hurvitz2014-03-24 18:02:17 +0100
commit8cec0b3fa1fa36dd8823cc718dc914e8f7c0b9c8 (patch)
tree89053258a3ce262ef119984feee5da580d4136ae /OpenSim
parentFixed updating usersettings in the database (diff)
downloadopensim-SC_OLD-8cec0b3fa1fa36dd8823cc718dc914e8f7c0b9c8.zip
opensim-SC_OLD-8cec0b3fa1fa36dd8823cc718dc914e8f7c0b9c8.tar.gz
opensim-SC_OLD-8cec0b3fa1fa36dd8823cc718dc914e8f7c0b9c8.tar.bz2
opensim-SC_OLD-8cec0b3fa1fa36dd8823cc718dc914e8f7c0b9c8.tar.xz
If updating a user's profile notes fails then return an error
Resolves http://opensimulator.org/mantis/view.php?id=6938
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
index d30cc22..d55142e 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
@@ -273,10 +273,10 @@ namespace OpenSim.Server.Handlers
273 response.Result = OSD.SerializeMembers(note); 273 response.Result = OSD.SerializeMembers(note);
274 return true; 274 return true;
275 } 275 }
276 276
277 object Notes = (object) note; 277 response.Error.Code = ErrorCode.InternalError;
278 OSD.DeserializeMembers(ref Notes, (OSDMap)json["params"]); 278 response.Error.Message = "Error reading notes";
279 return true; 279 return false;
280 } 280 }
281 281
282 public bool NotesUpdate(OSDMap json, ref JsonRpcResponse response) 282 public bool NotesUpdate(OSDMap json, ref JsonRpcResponse response)