aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/IClientAPI.cs4
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs4
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs7
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs23
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
6 files changed, 13 insertions, 29 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 3a5402c..5baa595 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -53,11 +53,9 @@ namespace OpenSim.Framework
53 53
54 public delegate void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, 54 public delegate void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
55 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 55 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
56 uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags,
57 bool RezSelected, bool RemoveItem, UUID fromTaskID); 56 bool RezSelected, bool RemoveItem, UUID fromTaskID);
58 57
59 public delegate void RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt, 58 public delegate void RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
60 uint ItemFlags, uint NextOwnerMask);
61 59
62 public delegate void ObjectAttach(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot); 60 public delegate void ObjectAttach(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot);
63 61
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index e3efb42..ef2b2ba 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4135,8 +4135,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4135 handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd, 4135 handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd,
4136 rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID, 4136 rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID,
4137 rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection, 4137 rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection,
4138 rezPacket.RezData.EveryoneMask, rezPacket.RezData.GroupMask,
4139 rezPacket.RezData.NextOwnerMask, rezPacket.RezData.ItemFlags,
4140 rezPacket.RezData.RezSelected, rezPacket.RezData.RemoveItem, 4138 rezPacket.RezData.RezSelected, rezPacket.RezData.RemoveItem,
4141 rezPacket.RezData.FromTaskID); 4139 rezPacket.RezData.FromTaskID);
4142 } 4140 }
@@ -4250,7 +4248,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4250 { 4248 {
4251 RezSingleAttachmentFromInvPacket rez = (RezSingleAttachmentFromInvPacket)Pack; 4249 RezSingleAttachmentFromInvPacket rez = (RezSingleAttachmentFromInvPacket)Pack;
4252 handlerRezSingleAttachment(this, rez.ObjectData.ItemID, 4250 handlerRezSingleAttachment(this, rez.ObjectData.ItemID,
4253 rez.ObjectData.AttachmentPt, rez.ObjectData.ItemFlags, rez.ObjectData.NextOwnerMask); 4251 rez.ObjectData.AttachmentPt);
4254 } 4252 }
4255 4253
4256 break; 4254 break;
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index f5ec6c7..49d9aec 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
82 byte field, uint localId, uint mask, byte set) { this.Stale = true; }; 82 byte field, uint localId, uint mask, byte set) { this.Stale = true; };
83 client.OnRezObject += delegate(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, 83 client.OnRezObject += delegate(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd,
84 Vector3 RayStart, UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 84 Vector3 RayStart, UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
85 uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, bool RezSelected, 85 bool RezSelected,
86 bool RemoveItem, UUID fromTaskID) { this.Stale = true; }; 86 bool RemoveItem, UUID fromTaskID) { this.Stale = true; };
87 } 87 }
88 88
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 7ab0deb..f06b77f 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -452,13 +452,10 @@ namespace OpenSim.Region.Environment.Scenes
452 } 452 }
453 453
454 public SceneObjectGroup RezSingleAttachment( 454 public SceneObjectGroup RezSingleAttachment(
455 IClientAPI remoteClient, UUID itemID, uint AttachmentPt,uint ItemFlags, uint NextOwnerMask) 455 IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
456 { 456 {
457 SceneObjectGroup objatt = m_parentScene.RezObject(remoteClient, itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true, 457 SceneObjectGroup objatt = m_parentScene.RezObject(remoteClient, itemID, Vector3.Zero, Vector3.Zero, UUID.Zero, (byte)1, true,
458 (uint)(PermissionMask.Copy | PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer), 458 false, false, remoteClient.AgentId, true);
459 (uint)(PermissionMask.Copy | PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer),
460 (uint)(PermissionMask.Copy | PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer),
461 ItemFlags, false, false, remoteClient.AgentId, true);
462 459
463 if (objatt != null) 460 if (objatt != null)
464 { 461 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 26f3e1d..2285b04 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1677,9 +1677,10 @@ namespace OpenSim.Region.Environment.Scenes
1677 { 1677 {
1678 if (!grp.HasGroupChanged) 1678 if (!grp.HasGroupChanged)
1679 { 1679 {
1680 m_log.InfoFormat("Detaching {0} which is unchanged", grp.UUID.ToString()); 1680 m_log.InfoFormat("[ATTACHMENT] Detaching {0} which is unchanged", grp.UUID.ToString());
1681 return; 1681 return;
1682 } 1682 }
1683 m_log.InfoFormat("[ATTACHMENT] Updating asset for attachment {0}, attachpoint {1}", grp.UUID.ToString(), grp.GetAttachmentPoint());
1683 string sceneObjectXml = objectGroup.ToXmlString(); 1684 string sceneObjectXml = objectGroup.ToXmlString();
1684 1685
1685 CachedUserInfo userInfo = 1686 CachedUserInfo userInfo =
@@ -1818,19 +1819,16 @@ namespace OpenSim.Region.Environment.Scenes
1818 /// <param name="RayEndIsIntersection"></param> 1819 /// <param name="RayEndIsIntersection"></param>
1819 /// <param name="EveryoneMask"></param> 1820 /// <param name="EveryoneMask"></param>
1820 /// <param name="GroupMask"></param> 1821 /// <param name="GroupMask"></param>
1821 /// <param name="NextOwnerMask"></param>
1822 /// <param name="ItemFlags"></param>
1823 /// <param name="RezSelected"></param> 1822 /// <param name="RezSelected"></param>
1824 /// <param name="RemoveItem"></param> 1823 /// <param name="RemoveItem"></param>
1825 /// <param name="fromTaskID"></param> 1824 /// <param name="fromTaskID"></param>
1826 public virtual void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, 1825 public virtual void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
1827 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 1826 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
1828 uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags,
1829 bool RezSelected, bool RemoveItem, UUID fromTaskID) 1827 bool RezSelected, bool RemoveItem, UUID fromTaskID)
1830 { 1828 {
1831 RezObject( 1829 RezObject(
1832 remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection, 1830 remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
1833 EveryoneMask, GroupMask, NextOwnerMask, ItemFlags, RezSelected, RemoveItem, fromTaskID, false); 1831 RezSelected, RemoveItem, fromTaskID, false);
1834 } 1832 }
1835 1833
1836 /// <summary> 1834 /// <summary>
@@ -1843,10 +1841,6 @@ namespace OpenSim.Region.Environment.Scenes
1843 /// <param name="RayTargetID"></param> 1841 /// <param name="RayTargetID"></param>
1844 /// <param name="BypassRayCast"></param> 1842 /// <param name="BypassRayCast"></param>
1845 /// <param name="RayEndIsIntersection"></param> 1843 /// <param name="RayEndIsIntersection"></param>
1846 /// <param name="EveryoneMask"></param>
1847 /// <param name="GroupMask"></param>
1848 /// <param name="NextOwnerMask"></param>
1849 /// <param name="ItemFlags"></param>
1850 /// <param name="RezSelected"></param> 1844 /// <param name="RezSelected"></param>
1851 /// <param name="RemoveItem"></param> 1845 /// <param name="RemoveItem"></param>
1852 /// <param name="fromTaskID"></param> 1846 /// <param name="fromTaskID"></param>
@@ -1854,7 +1848,6 @@ namespace OpenSim.Region.Environment.Scenes
1854 /// <returns></returns> 1848 /// <returns></returns>
1855 public virtual SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, 1849 public virtual SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
1856 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 1850 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
1857 uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags,
1858 bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment) 1851 bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
1859 { 1852 {
1860 // Work out position details 1853 // Work out position details
@@ -2259,9 +2252,9 @@ namespace OpenSim.Region.Environment.Scenes
2259 } 2252 }
2260 2253
2261 public void RezSingleAttachment(IClientAPI remoteClient, UUID itemID, 2254 public void RezSingleAttachment(IClientAPI remoteClient, UUID itemID,
2262 uint AttachmentPt, uint ItemFlags, uint NextOwnerMask) 2255 uint AttachmentPt)
2263 { 2256 {
2264 SceneObjectGroup att = m_innerScene.RezSingleAttachment(remoteClient, itemID, AttachmentPt, ItemFlags, NextOwnerMask); 2257 SceneObjectGroup att = m_innerScene.RezSingleAttachment(remoteClient, itemID, AttachmentPt);
2265 2258
2266 if (att == null) 2259 if (att == null)
2267 { 2260 {
@@ -2269,13 +2262,11 @@ namespace OpenSim.Region.Environment.Scenes
2269 return; 2262 return;
2270 } 2263 }
2271 2264
2272 RezSingleAttachment(att, remoteClient, itemID, AttachmentPt, 2265 RezSingleAttachment(att, remoteClient, itemID, AttachmentPt);
2273 ItemFlags, NextOwnerMask);
2274 } 2266 }
2275 2267
2276 public void RezSingleAttachment(SceneObjectGroup att, 2268 public void RezSingleAttachment(SceneObjectGroup att,
2277 IClientAPI remoteClient, UUID itemID, uint AttachmentPt, 2269 IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
2278 uint ItemFlags, uint NextOwnerMask)
2279 { 2270 {
2280 if (att.RootPart != null) 2271 if (att.RootPart != null)
2281 AttachmentPt = att.RootPart.AttachmentPoint; 2272 AttachmentPt = att.RootPart.AttachmentPoint;
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 4c0aa90..30f3e04 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2958,7 +2958,7 @@ namespace OpenSim.Region.Environment.Scenes
2958 { 2958 {
2959 // Rez from inventory 2959 // Rez from inventory
2960 m_scene.RezSingleAttachment(ControllingClient, itemID, 2960 m_scene.RezSingleAttachment(ControllingClient, itemID,
2961 (uint)attachpoint, 0, 0); 2961 (uint)attachpoint);
2962 } 2962 }
2963 catch (Exception e) 2963 catch (Exception e)
2964 { 2964 {