diff options
| author | Justin Clark-Casey (justincc) | 2014-01-15 00:28:58 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-01-15 00:28:58 +0000 |
| commit | 91d86301efd478f9a10a077597e9c631e029457b (patch) | |
| tree | 0c298b09c55bd7d8d5eb1bb5b9d7a83c2173f65c /OpenSim/Region | |
| parent | Fix false positive test failure in TestRepeatSameDrawContainingImageReusingTe... (diff) | |
| parent | Dynamically adjust to the number of visual params sent. (diff) | |
| download | opensim-SC_OLD-91d86301efd478f9a10a077597e9c631e029457b.zip opensim-SC_OLD-91d86301efd478f9a10a077597e9c631e029457b.tar.gz opensim-SC_OLD-91d86301efd478f9a10a077597e9c631e029457b.tar.bz2 opensim-SC_OLD-91d86301efd478f9a10a077597e9c631e029457b.tar.xz | |
Merge branch '0.7.6-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7.6-post-fixes
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index c27e613..0b8aceb 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -3631,7 +3631,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 3631 | 3631 | ||
| 3632 | AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance); | 3632 | AvatarAppearancePacket avp = (AvatarAppearancePacket)PacketPool.Instance.GetPacket(PacketType.AvatarAppearance); |
| 3633 | // TODO: don't create new blocks if recycling an old packet | 3633 | // TODO: don't create new blocks if recycling an old packet |
| 3634 | avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218]; | 3634 | avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[visualParams.Length]; |
| 3635 | avp.ObjectData.TextureEntry = textureEntry; | 3635 | avp.ObjectData.TextureEntry = textureEntry; |
| 3636 | 3636 | ||
| 3637 | AvatarAppearancePacket.VisualParamBlock avblock = null; | 3637 | AvatarAppearancePacket.VisualParamBlock avblock = null; |
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())) |