aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-12-05 04:17:21 +0000
committerMelanie Thielker2008-12-05 04:17:21 +0000
commit1cad124b7d99c4c0e8f01210a14cd2604c92a1d1 (patch)
tree8e2b17977fd5e192939991ce0818894ae1721d8c
parentYay for languages without default parameter values (diff)
downloadopensim-SC_OLD-1cad124b7d99c4c0e8f01210a14cd2604c92a1d1.zip
opensim-SC_OLD-1cad124b7d99c4c0e8f01210a14cd2604c92a1d1.tar.gz
opensim-SC_OLD-1cad124b7d99c4c0e8f01210a14cd2604c92a1d1.tar.bz2
opensim-SC_OLD-1cad124b7d99c4c0e8f01210a14cd2604c92a1d1.tar.xz
Allow no-copy attachments to be worn without losing them
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 3d6a905..aa74e01 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -2194,8 +2194,6 @@ namespace OpenSim.Region.Environment.Scenes
2194 { 2194 {
2195 group.ClearPartAttachmentData(); 2195 group.ClearPartAttachmentData();
2196 } 2196 }
2197 // Ghost prim if this is enabled!
2198 //group.ApplyPhysics(m_physicalPrim);
2199 } 2197 }
2200 2198
2201 // Fire on_rez 2199 // Fire on_rez
@@ -2208,7 +2206,13 @@ namespace OpenSim.Region.Environment.Scenes
2208 if (!Permissions.BypassPermissions()) 2206 if (!Permissions.BypassPermissions())
2209 { 2207 {
2210 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) 2208 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
2211 userInfo.DeleteItem(item.ID); 2209 {
2210 // If this is done on attachments, no
2211 // copy ones will be lost, so avoid it
2212 //
2213 if (!attachment)
2214 userInfo.DeleteItem(item.ID);
2215 }
2212 } 2216 }
2213 2217
2214 return rootPart.ParentGroup; 2218 return rootPart.ParentGroup;