aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs19
1 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 784d04c..e145f4a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -2308,15 +2308,6 @@ namespace OpenSim.Region.Environment.Scenes
2308 EventManager.TriggerStopScript(part.LocalId, itemID); 2308 EventManager.TriggerStopScript(part.LocalId, itemID);
2309 } 2309 }
2310 2310
2311// public void TestFunction()
2312// {
2313// IInventoryModule imod = RequestModuleInterface<IInventoryModule>();
2314// if (imod == null)
2315// return;
2316//
2317// imod.TestFunction();
2318// }
2319
2320 public void RezSingleAttachment(IClientAPI remoteClient, LLUUID itemID, 2311 public void RezSingleAttachment(IClientAPI remoteClient, LLUUID itemID,
2321 uint AttachmentPt, uint ItemFlags, uint NextOwnerMask) 2312 uint AttachmentPt, uint ItemFlags, uint NextOwnerMask)
2322 { 2313 {
@@ -2328,13 +2319,21 @@ namespace OpenSim.Region.Environment.Scenes
2328 return; 2319 return;
2329 } 2320 }
2330 2321
2322 RezSingleAttachment(att, remoteClient, itemID, AttachmentPt,
2323 ItemFlags, NextOwnerMask);
2324 }
2325
2326 public void RezSingleAttachment(SceneObjectGroup att,
2327 IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt,
2328 uint ItemFlags, uint NextOwnerMask)
2329 {
2331 if (att.RootPart != null) 2330 if (att.RootPart != null)
2332 AttachmentPt = att.RootPart.AttachmentPoint; 2331 AttachmentPt = att.RootPart.AttachmentPoint;
2333 2332
2334 ScenePresence presence; 2333 ScenePresence presence;
2335 if(TryGetAvatar(remoteClient.AgentId, out presence)) 2334 if(TryGetAvatar(remoteClient.AgentId, out presence))
2336 { 2335 {
2337 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, att.GetFromAssetID()); 2336 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, att.UUID);
2338 IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>(); 2337 IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
2339 if(ava != null) 2338 if(ava != null)
2340 { 2339 {