diff options
author | Melanie Thielker | 2008-11-07 05:48:44 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-07 05:48:44 +0000 |
commit | 48c6d052d94a7ab57c5264f09e989fa717c730f5 (patch) | |
tree | 2af23487a496bc60c0ca3839783e57bfac1ce3de /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |
parent | * Fix half of the issue behind the long standing 'UseCircuitCode' packet spam... (diff) | |
download | opensim-SC_OLD-48c6d052d94a7ab57c5264f09e989fa717c730f5.zip opensim-SC_OLD-48c6d052d94a7ab57c5264f09e989fa717c730f5.tar.gz opensim-SC_OLD-48c6d052d94a7ab57c5264f09e989fa717c730f5.tar.bz2 opensim-SC_OLD-48c6d052d94a7ab57c5264f09e989fa717c730f5.tar.xz |
Attachments, attachments, and, did I say attachments?
Too many fixes to list.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 42986ec..c59fffc 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -1601,7 +1601,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1601 | } | 1601 | } |
1602 | else if (permissionToDelete) | 1602 | else if (permissionToDelete) |
1603 | { | 1603 | { |
1604 | DeleteSceneObject(grp); | 1604 | DeleteSceneObject(grp, false); |
1605 | } | 1605 | } |
1606 | } | 1606 | } |
1607 | 1607 | ||
@@ -1735,7 +1735,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1735 | 1735 | ||
1736 | // Finally remove the item, for reals this time. | 1736 | // Finally remove the item, for reals this time. |
1737 | if (permissionToDelete) | 1737 | if (permissionToDelete) |
1738 | DeleteSceneObject(objectGroup); | 1738 | DeleteSceneObject(objectGroup, false); |
1739 | } | 1739 | } |
1740 | 1740 | ||
1741 | public void updateKnownAsset(IClientAPI remoteClient, SceneObjectGroup grp, UUID assetID, UUID agentID) | 1741 | public void updateKnownAsset(IClientAPI remoteClient, SceneObjectGroup grp, UUID assetID, UUID agentID) |
@@ -2279,7 +2279,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2279 | 2279 | ||
2280 | returnobjects[i] = null; | 2280 | returnobjects[i] = null; |
2281 | 2281 | ||
2282 | DeleteSceneObject(ObjectDeleting); | 2282 | DeleteSceneObject(ObjectDeleting, false); |
2283 | ObjectDeleting = null; | 2283 | ObjectDeleting = null; |
2284 | } | 2284 | } |
2285 | else | 2285 | else |
@@ -2320,7 +2320,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2320 | EventManager.TriggerStopScript(part.LocalId, itemID); | 2320 | EventManager.TriggerStopScript(part.LocalId, itemID); |
2321 | } | 2321 | } |
2322 | 2322 | ||
2323 | public void RezSingleAttachment(IClientAPI remoteClient, UUID itemID, | 2323 | public UUID RezSingleAttachment(IClientAPI remoteClient, UUID itemID, |
2324 | uint AttachmentPt) | 2324 | uint AttachmentPt) |
2325 | { | 2325 | { |
2326 | SceneObjectGroup att = m_innerScene.RezSingleAttachment(remoteClient, itemID, AttachmentPt); | 2326 | SceneObjectGroup att = m_innerScene.RezSingleAttachment(remoteClient, itemID, AttachmentPt); |
@@ -2328,13 +2328,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
2328 | if (att == null) | 2328 | if (att == null) |
2329 | { | 2329 | { |
2330 | DetachSingleAttachmentToInv(itemID, remoteClient); | 2330 | DetachSingleAttachmentToInv(itemID, remoteClient); |
2331 | return; | 2331 | return UUID.Zero; |
2332 | } | 2332 | } |
2333 | 2333 | ||
2334 | RezSingleAttachment(att, remoteClient, itemID, AttachmentPt); | 2334 | return RezSingleAttachment(att, remoteClient, itemID, AttachmentPt); |
2335 | } | 2335 | } |
2336 | 2336 | ||
2337 | public void RezSingleAttachment(SceneObjectGroup att, | 2337 | public UUID RezSingleAttachment(SceneObjectGroup att, |
2338 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt) | 2338 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt) |
2339 | { | 2339 | { |
2340 | if (att.RootPart != null) | 2340 | if (att.RootPart != null) |
@@ -2351,11 +2351,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
2351 | } | 2351 | } |
2352 | 2352 | ||
2353 | } | 2353 | } |
2354 | return att.UUID; | ||
2354 | } | 2355 | } |
2355 | 2356 | ||
2356 | public void AttachObject(IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos) | 2357 | public void AttachObject(IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos) |
2357 | { | 2358 | { |
2358 | m_innerScene.AttachObject(controllingClient, localID, attachPoint, rot, pos); | 2359 | m_innerScene.AttachObject(controllingClient, localID, attachPoint, rot, pos, false); |
2359 | } | 2360 | } |
2360 | 2361 | ||
2361 | public void AttachObject(IClientAPI remoteClient, uint AttachmentPt, UUID itemID, SceneObjectGroup att) | 2362 | public void AttachObject(IClientAPI remoteClient, uint AttachmentPt, UUID itemID, SceneObjectGroup att) |