ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where only one of multiple attachments on the same attachpoint for NPCs would be seen by other viewers.

Browse Source 
It appears that at least Singularity 1.8.5 (but probably others) rely on attachment FromItemIDs being different to display more than one.
This commit resolves this by generating random IDs instead of always using UUID.Zero for NPCs.
Resolves http://opensimulator.org/mantis/view.php?id=7110
This commit is contained in:
Justin Clark-Casey (justincc)
2014-05-01 22:24:21 +01:00
parent f0411dc128
commit c31d93cb6f
4 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -5304,10 +5304,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//update.JointType = 0;
update.Material = data.Material;
update.MediaURL = Utils.EmptyBytes; // FIXME: Support this in OpenSim
if (data.ParentGroup.IsAttachment)
{
update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.ParentGroup.FromItemID);
update.NameValue
= Util.StringToBytes256(
string.Format("AttachItemID STRING RW SV {0}", data.ParentGroup.FromItemID));
update.State = (byte)((data.ParentGroup.AttachmentPoint % 16) * 16 + (data.ParentGroup.AttachmentPoint / 16));
// m_log.DebugFormat(
// "[LLCLIENTVIEW]: Sending NameValue {0} for {1} {2} to {3}",
// Util.UTF8.GetString(update.NameValue), data.Name, data.LocalId, Name);
//
// m_log.DebugFormat(
// "[LLCLIENTVIEW]: Sending state {0} for {1} {2} to {3}",
// update.State, data.Name, data.LocalId, Name);
}
else
{
@@ -5318,10 +5330,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
update.State = data.ParentGroup.RootPart.Shape.State;
}
// m_log.DebugFormat(
// "[LLCLIENTVIEW]: Sending state {0} for {1} {2} to {3}",
// update.State, data.Name, data.LocalId, Name);
update.ObjectData = objectData;
update.ParentID = data.ParentID;
update.PathBegin = data.Shape.PathBegin;