From bfc8dc9a87189b8e36cf445e21ce17257d0d2dd2 Mon Sep 17 00:00:00 2001 From: phaik Date: Tue, 20 Nov 2007 05:52:30 +0000 Subject: [PATCH] courtesy of jradford: ObjectPropertiesFamily Patch, allows addition of objectpropertiesfamily replies to the object tracker dictionary. git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1495 52acb1d6-8a22-11de-b505-999d5b087335 --- libsecondlife/ObjectManager.cs | 40 ++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/libsecondlife/ObjectManager.cs b/libsecondlife/ObjectManager.cs index d72c045d..81c2de93 100644 --- a/libsecondlife/ObjectManager.cs +++ b/libsecondlife/ObjectManager.cs @@ -2132,19 +2132,22 @@ namespace libsecondlife for (int j = 0; j < numTextures; ++j) props.TextureIDs[j] = new LLUUID(objectData.TextureID, j * 16); - Primitive findPrim = sim.Objects.Find( - delegate(Primitive prim) { return prim.ID == props.ObjectID; }); - - if (findPrim != null) + if (Client.Settings.OBJECT_TRACKING) { - lock (sim.Objects.Prims) - { - if (sim.Objects.Prims.ContainsKey(findPrim.LocalID)) - sim.Objects.Prims[findPrim.LocalID].Properties = props; - } - } + Primitive findPrim = sim.Objects.Find( + delegate(Primitive prim) { return prim.ID == props.ObjectID; }); - FireOnObjectProperties(sim, props); + if (findPrim != null) + { + lock (sim.Objects.Prims) + { + if (sim.Objects.Prims.ContainsKey(findPrim.LocalID)) + sim.Objects.Prims[findPrim.LocalID].Properties = props; + } + } + + FireOnObjectProperties(sim, props); + } } } @@ -2170,6 +2173,21 @@ namespace libsecondlife props.Permissions.NextOwnerMask = (PermissionMask)op.ObjectData.NextOwnerMask; props.Permissions.OwnerMask = (PermissionMask)op.ObjectData.OwnerMask; + if (Client.Settings.OBJECT_TRACKING) + { + Primitive findPrim = sim.Objects.Find( + delegate(Primitive prim) { return prim.ID == props.ObjectID; }); + + if (findPrim != null) + { + lock (sim.Objects.Prims) + { + if (sim.Objects.Prims.ContainsKey(findPrim.LocalID)) + sim.Objects.Prims[findPrim.LocalID].PropertiesFamily = props; + } + } + } + FireOnObjectPropertiesFamily(sim, props); }