diff options
author | BlueWall | 2013-12-16 15:43:34 -0500 |
---|---|---|
committer | BlueWall | 2013-12-16 17:36:21 -0500 |
commit | 141d771a931140402cfa0575cf31e7116540f7d0 (patch) | |
tree | 07f50f78ff07b0c29bc6b79cf6cafd352e111892 /OpenSim | |
parent | Populate user preferences with UserAccount email if it is present, else retur... (diff) | |
download | opensim-SC_OLD-141d771a931140402cfa0575cf31e7116540f7d0.zip opensim-SC_OLD-141d771a931140402cfa0575cf31e7116540f7d0.tar.gz opensim-SC_OLD-141d771a931140402cfa0575cf31e7116540f7d0.tar.bz2 opensim-SC_OLD-141d771a931140402cfa0575cf31e7116540f7d0.tar.xz |
Fix issue with editing notes for other avatars
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLUserProfilesData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs index 0bf9595..6ed3b06 100644 --- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs +++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs | |||
@@ -546,6 +546,10 @@ namespace OpenSim.Data.MySQL | |||
546 | reader.Read(); | 546 | reader.Read(); |
547 | notes.Notes = OSD.FromString((string)reader["notes"]); | 547 | notes.Notes = OSD.FromString((string)reader["notes"]); |
548 | } | 548 | } |
549 | else | ||
550 | { | ||
551 | notes.Notes = OSD.FromString(""); | ||
552 | } | ||
549 | } | 553 | } |
550 | } | 554 | } |
551 | } | 555 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs index b21082f..bfa30e6 100644 --- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |||
@@ -758,8 +758,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
758 | IClientAPI remoteClient = (IClientAPI)sender; | 758 | IClientAPI remoteClient = (IClientAPI)sender; |
759 | string serverURI = string.Empty; | 759 | string serverURI = string.Empty; |
760 | GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | 760 | GetUserProfileServerURI(remoteClient.AgentId, out serverURI); |
761 | note.TargetId = remoteClient.AgentId; | 761 | note.UserId = remoteClient.AgentId; |
762 | UUID.TryParse(args[0], out note.UserId); | 762 | UUID.TryParse(args[0], out note.TargetId); |
763 | 763 | ||
764 | object Note = (object)note; | 764 | object Note = (object)note; |
765 | if(!JsonRpcRequest(ref Note, "avatarnotesrequest", serverURI, UUID.Random().ToString())) | 765 | if(!JsonRpcRequest(ref Note, "avatarnotesrequest", serverURI, UUID.Random().ToString())) |