aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-27 20:10:28 +0000
committerTeravus Ovares2008-04-27 20:10:28 +0000
commit911e63765c7cea748b5ae2227f5c1d6ff131d329 (patch)
treef95eeffb4974a9b3f6ded4a46bdc240278a336b0 /OpenSim/Region/Environment/Scenes/Scene.cs
parentMinor svn, formatting cleanup. (diff)
downloadopensim-SC_OLD-911e63765c7cea748b5ae2227f5c1d6ff131d329.zip
opensim-SC_OLD-911e63765c7cea748b5ae2227f5c1d6ff131d329.tar.gz
opensim-SC_OLD-911e63765c7cea748b5ae2227f5c1d6ff131d329.tar.bz2
opensim-SC_OLD-911e63765c7cea748b5ae2227f5c1d6ff131d329.tar.xz
* Single Attachments now work from inventory. You can attach from inventory and detach from inventory.
* Detaching from right clicking in world, detaches to your inventory. * If you go up to a prim and attach it from in world, it appears in your inventory. * Attachment placement is saved when you detach them. * Choosing wear remembers your last attachment point from inventory. * Wrote a method to update an inventory item's asset and sends the updated inventory item to the Client * Wrote a recursive method to find the folder of a known existing inventory item. * Removed a block on physics object position on creation. This might crash a region or two, let us know via Mantis if your region crashes because of a physics out of bounds error. * Drop doesn't work. The menu item doesn't even come up. Don't know why :P.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a9fa93e..f94aec7 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1471,6 +1471,11 @@ namespace OpenSim.Region.Environment.Scenes
1471 ScenePresence sp = GetScenePresence(grp.OwnerID); 1471 ScenePresence sp = GetScenePresence(grp.OwnerID);
1472 if (sp != null) 1472 if (sp != null)
1473 { 1473 {
1474 // hack assetID until we get assetID into the XML format.
1475 // LastOwnerID is used for group deeding, so when you do stuff
1476 // with the deeded object, it goes back to them
1477
1478 grp.SetFromAssetID(grp.RootPart.LastOwnerID);
1474 m_innerScene.AttachObject(sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition); 1479 m_innerScene.AttachObject(sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition);
1475 } 1480 }
1476 } 1481 }
@@ -1560,6 +1565,7 @@ namespace OpenSim.Region.Environment.Scenes
1560 client.OnDeRezObject += DeRezObject; 1565 client.OnDeRezObject += DeRezObject;
1561 client.OnRezObject += RezObject; 1566 client.OnRezObject += RezObject;
1562 client.OnRezSingleAttachmentFromInv += m_innerScene.RezSingleAttachment; 1567 client.OnRezSingleAttachmentFromInv += m_innerScene.RezSingleAttachment;
1568 client.OnDetachAttachmentIntoInv += m_innerScene.DetachSingleAttachmentToInv;
1563 client.OnObjectAttach += m_innerScene.AttachObject; 1569 client.OnObjectAttach += m_innerScene.AttachObject;
1564 client.OnObjectDetach += m_innerScene.DetachObject; 1570 client.OnObjectDetach += m_innerScene.DetachObject;
1565 client.OnNameFromUUIDRequest += CommsManager.HandleUUIDNameRequest; 1571 client.OnNameFromUUIDRequest += CommsManager.HandleUUIDNameRequest;