diff options
Intermediate commit. Sill errors.
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Services/UserProfilesService/UserProfilesService.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs index 56ff2bd..d359ebc 100644 --- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |||
@@ -754,8 +754,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
754 | IClientAPI remoteClient = (IClientAPI)sender; | 754 | IClientAPI remoteClient = (IClientAPI)sender; |
755 | string serverURI = string.Empty; | 755 | string serverURI = string.Empty; |
756 | GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | 756 | GetUserProfileServerURI(remoteClient.AgentId, out serverURI); |
757 | note.TargetId = remoteClient.AgentId; | 757 | note.UserId = remoteClient.AgentId; |
758 | UUID.TryParse(args[0], out note.UserId); | 758 | UUID.TryParse(args[0], out note.TargetId); |
759 | 759 | ||
760 | object Note = (object)note; | 760 | object Note = (object)note; |
761 | if(!JsonRpcRequest(ref Note, "avatarnotesrequest", serverURI, UUID.Random().ToString())) | 761 | if(!JsonRpcRequest(ref Note, "avatarnotesrequest", serverURI, UUID.Random().ToString())) |