aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBlueWall2013-12-16 15:43:34 -0500
committerBlueWall2013-12-16 16:26:28 -0500
commit017ae9132ef6be0bbc111c66e658edb2ad73e58e (patch)
treedafbb2cefd4903a66870dce232f25a0349a94094
parentPopulate user preferences with UserAccount email if it is present, else retur... (diff)
downloadopensim-SC_OLD-017ae9132ef6be0bbc111c66e658edb2ad73e58e.zip
opensim-SC_OLD-017ae9132ef6be0bbc111c66e658edb2ad73e58e.tar.gz
opensim-SC_OLD-017ae9132ef6be0bbc111c66e658edb2ad73e58e.tar.bz2
opensim-SC_OLD-017ae9132ef6be0bbc111c66e658edb2ad73e58e.tar.xz
Fix issue with editing notes for other avatars
-rw-r--r--OpenSim/Data/MySQL/MySQLUserProfilesData.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs4
2 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 48044f0..13e0a57 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 697a73e..e13bf4f 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -760,8 +760,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
760 IClientAPI remoteClient = (IClientAPI)sender; 760 IClientAPI remoteClient = (IClientAPI)sender;
761 string serverURI = string.Empty; 761 string serverURI = string.Empty;
762 GetUserProfileServerURI(remoteClient.AgentId, out serverURI); 762 GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
763 note.TargetId = remoteClient.AgentId; 763 note.UserId = remoteClient.AgentId;
764 UUID.TryParse(args[0], out note.UserId); 764 UUID.TryParse(args[0], out note.TargetId);
765 765
766 object Note = (object)note; 766 object Note = (object)note;
767 if(!JsonRpcRequest(ref Note, "avatarnotesrequest", serverURI, UUID.Random().ToString())) 767 if(!JsonRpcRequest(ref Note, "avatarnotesrequest", serverURI, UUID.Random().ToString()))