diff options
| author | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
| commit | 091f3a80008a0f4a756fcb9ff4e87a24c2948c3c (patch) | |
| tree | a98354e9317e0ed6892dec344a69447c0e9c70b8 /OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs | |
| parent | Don't fail to enable permissions modules correctly if there is any leading or... (diff) | |
| parent | Fixed Debug command for Groups. (Use of wrong capitalization caused *two* "de... (diff) | |
| download | opensim-SC-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.zip opensim-SC-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.gz opensim-SC-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.bz2 opensim-SC-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs')
| -rw-r--r-- | OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs | 8 |
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) |