aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-03-05 23:18:47 +0000
committerJustin Clark-Casey (justincc)2010-03-05 23:18:47 +0000
commit60553e62a3f576b8bf6ab88a83b2d4550bd69d2b (patch)
tree3e24624d846502dda17fdac827f070273fafba26 /OpenSim
parentautomatically delete %temp% directory after running tests (diff)
downloadopensim-SC_OLD-60553e62a3f576b8bf6ab88a83b2d4550bd69d2b.zip
opensim-SC_OLD-60553e62a3f576b8bf6ab88a83b2d4550bd69d2b.tar.gz
opensim-SC_OLD-60553e62a3f576b8bf6ab88a83b2d4550bd69d2b.tar.bz2
opensim-SC_OLD-60553e62a3f576b8bf6ab88a83b2d4550bd69d2b.tar.xz
refactor: begin to move attachments code into a region module
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs141
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs49
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs15
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs86
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs8
6 files changed, 205 insertions, 102 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
new file mode 100644
index 0000000..103a813
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -0,0 +1,141 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System.Reflection;
29using log4net;
30using Nini.Config;
31using OpenMetaverse;
32using OpenSim.Framework;
33using OpenSim.Region.Framework;
34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes;
36
37namespace OpenSim.Region.CoreModules.Avatar.Attachments
38{
39 public class AttachmentsModule : IAttachmentsModule, IRegionModule
40 {
41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42
43 protected Scene m_scene = null;
44
45 public void Initialise(Scene scene, IConfigSource source)
46 {
47 scene.RegisterModuleInterface<IAttachmentsModule>(this);
48 m_scene = scene;
49 }
50
51 public void PostInitialise()
52 {
53 }
54
55 public void Close()
56 {
57 }
58
59 public string Name
60 {
61 get { return "Attachments Module"; }
62 }
63
64 public bool IsSharedModule
65 {
66 get { return false; }
67 }
68
69 public bool AttachObject(
70 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)
71 {
72 SceneObjectGroup group = m_scene.GetGroupByPrim(objectLocalID);
73 if (group != null)
74 {
75 if (m_scene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
76 {
77 // If the attachment point isn't the same as the one previously used
78 // set it's offset position = 0 so that it appears on the attachment point
79 // and not in a weird location somewhere unknown.
80 if (AttachmentPt != 0 && AttachmentPt != (uint)group.GetAttachmentPoint())
81 {
82 attachPos = Vector3.Zero;
83 }
84
85 // AttachmentPt 0 means the client chose to 'wear' the attachment.
86 if (AttachmentPt == 0)
87 {
88 // Check object for stored attachment point
89 AttachmentPt = (uint)group.GetAttachmentPoint();
90 }
91
92 // if we still didn't find a suitable attachment point.......
93 if (AttachmentPt == 0)
94 {
95 // Stick it on left hand with Zero Offset from the attachment point.
96 AttachmentPt = (uint)AttachmentPoint.LeftHand;
97 attachPos = Vector3.Zero;
98 }
99
100 group.SetAttachmentPoint((byte)AttachmentPt);
101 group.AbsolutePosition = attachPos;
102
103 // Saves and gets itemID
104 UUID itemId;
105
106 if (group.GetFromItemID() == UUID.Zero)
107 {
108 m_scene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId);
109 }
110 else
111 {
112 itemId = group.GetFromItemID();
113 }
114
115 m_scene.AttachObject(remoteClient, AttachmentPt, itemId, group);
116
117 group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent);
118
119 // In case it is later dropped again, don't let
120 // it get cleaned up
121 group.RootPart.RemFlag(PrimFlags.TemporaryOnRez);
122 group.HasGroupChanged = false;
123 }
124 else
125 {
126 remoteClient.SendAgentAlertMessage(
127 "You don't have sufficient permissions to attach this object", false);
128
129 return false;
130 }
131 }
132 else
133 {
134 m_log.DebugFormat("[SCENE GRAPH]: AttachObject found no such scene object {0}", objectLocalID);
135 return false;
136 }
137
138 return true;
139 }
140 }
141} \ No newline at end of file
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
new file mode 100644
index 0000000..c965bcf
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -0,0 +1,49 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using OpenMetaverse;
30using OpenSim.Framework;
31
32namespace OpenSim.Region.Framework.Interfaces
33{
34 public interface IAttachmentsModule
35 {
36 /// <summary>
37 /// Attach an object to an avatar.
38 /// </summary>
39 /// <param name="controllingClient"></param>
40 /// <param name="localID"></param>
41 /// <param name="attachPoint"></param>
42 /// <param name="rot"></param>
43 /// <param name="pos"></param>
44 /// <param name="silent"></param>
45 /// <returns>true if the object was successfully attached, false otherwise</returns>
46 bool AttachObject(
47 IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent);
48 }
49} \ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 5f3cd8c..474fba9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1903,21 +1903,6 @@ namespace OpenSim.Region.Framework.Scenes
1903 } 1903 }
1904 1904
1905 /// <summary> 1905 /// <summary>
1906 /// Attach an object.
1907 /// </summary>
1908 /// <param name="controllingClient"></param>
1909 /// <param name="localID"></param>
1910 /// <param name="attachPoint"></param>
1911 /// <param name="rot"></param>
1912 /// <param name="pos"></param>
1913 /// <param name="silent"></param>
1914 /// <returns>true if the object was successfully attached, false otherwise</returns>
1915 public bool AttachObject(IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent)
1916 {
1917 return m_sceneGraph.AttachObject(controllingClient, localID, attachPoint, rot, pos, silent);
1918 }
1919
1920 /// <summary>
1921 /// This registers the item as attached in a user's inventory 1906 /// This registers the item as attached in a user's inventory
1922 /// </summary> 1907 /// </summary>
1923 /// <param name="remoteClient"></param> 1908 /// <param name="remoteClient"></param>
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a880fe7..c83132f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -307,6 +307,7 @@ namespace OpenSim.Region.Framework.Scenes
307 307
308 protected IXMLRPC m_xmlrpcModule; 308 protected IXMLRPC m_xmlrpcModule;
309 protected IWorldComm m_worldCommModule; 309 protected IWorldComm m_worldCommModule;
310 public IAttachmentsModule AttachmentsModule { get; set; }
310 protected IAvatarFactory m_AvatarFactory; 311 protected IAvatarFactory m_AvatarFactory;
311 public IAvatarFactory AvatarFactory 312 public IAvatarFactory AvatarFactory
312 { 313 {
@@ -1215,6 +1216,7 @@ namespace OpenSim.Region.Framework.Scenes
1215 m_worldCommModule = RequestModuleInterface<IWorldComm>(); 1216 m_worldCommModule = RequestModuleInterface<IWorldComm>();
1216 XferManager = RequestModuleInterface<IXfer>(); 1217 XferManager = RequestModuleInterface<IXfer>();
1217 m_AvatarFactory = RequestModuleInterface<IAvatarFactory>(); 1218 m_AvatarFactory = RequestModuleInterface<IAvatarFactory>();
1219 AttachmentsModule = RequestModuleInterface<IAttachmentsModule>();
1218 m_serialiser = RequestModuleInterface<IRegionSerialiserModule>(); 1220 m_serialiser = RequestModuleInterface<IRegionSerialiserModule>();
1219 m_dialogModule = RequestModuleInterface<IDialogModule>(); 1221 m_dialogModule = RequestModuleInterface<IDialogModule>();
1220 m_capsModule = RequestModuleInterface<ICapabilitiesModule>(); 1222 m_capsModule = RequestModuleInterface<ICapabilitiesModule>();
@@ -2405,9 +2407,11 @@ namespace OpenSim.Region.Framework.Scenes
2405 //grp.SetFromAssetID(grp.RootPart.LastOwnerID); 2407 //grp.SetFromAssetID(grp.RootPart.LastOwnerID);
2406 m_log.DebugFormat( 2408 m_log.DebugFormat(
2407 "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition); 2409 "[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition);
2410
2411 if (AttachmentsModule != null)
2412 AttachmentsModule.AttachObject(
2413 sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false);
2408 2414
2409 AttachObject(
2410 sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false);
2411 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2415 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2412 grp.SendGroupFullUpdate(); 2416 grp.SendGroupFullUpdate();
2413 } 2417 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 22613e9..48744d7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -504,7 +504,7 @@ namespace OpenSim.Region.Framework.Scenes
504 return; 504 return;
505 505
506 // Calls attach with a Zero position 506 // Calls attach with a Zero position
507 if (AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false)) 507 if (m_parentScene.AttachmentsModule.AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false))
508 { 508 {
509 m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId); 509 m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
510 510
@@ -547,8 +547,10 @@ namespace OpenSim.Region.Framework.Scenes
547 if (AttachmentPt != 0 && AttachmentPt != objatt.GetAttachmentPoint()) 547 if (AttachmentPt != 0 && AttachmentPt != objatt.GetAttachmentPoint())
548 tainted = true; 548 tainted = true;
549 549
550 AttachObject(remoteClient, objatt.LocalId, AttachmentPt, Quaternion.Identity, objatt.AbsolutePosition, false); 550 m_parentScene.AttachmentsModule.AttachObject(
551 remoteClient, objatt.LocalId, AttachmentPt, Quaternion.Identity, objatt.AbsolutePosition, false);
551 //objatt.ScheduleGroupForFullUpdate(); 552 //objatt.ScheduleGroupForFullUpdate();
553
552 if (tainted) 554 if (tainted)
553 objatt.HasGroupChanged = true; 555 objatt.HasGroupChanged = true;
554 556
@@ -605,86 +607,6 @@ namespace OpenSim.Region.Framework.Scenes
605 } 607 }
606 } 608 }
607 609
608 /// <summary>
609 /// Attach a scene object to an avatar.
610 /// </summary>
611 /// <param name="remoteClient"></param>
612 /// <param name="objectLocalID"></param>
613 /// <param name="AttachmentPt"></param>
614 /// <param name="rot"></param>
615 /// <param name="attachPos"></param>
616 /// <param name="silent"></param>
617 /// <returns>true if the attachment was successful, false otherwise</returns>
618 protected internal bool AttachObject(
619 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)
620 {
621 SceneObjectGroup group = GetGroupByPrim(objectLocalID);
622 if (group != null)
623 {
624 if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
625 {
626 // If the attachment point isn't the same as the one previously used
627 // set it's offset position = 0 so that it appears on the attachment point
628 // and not in a weird location somewhere unknown.
629 if (AttachmentPt != 0 && AttachmentPt != (uint)group.GetAttachmentPoint())
630 {
631 attachPos = Vector3.Zero;
632 }
633
634 // AttachmentPt 0 means the client chose to 'wear' the attachment.
635 if (AttachmentPt == 0)
636 {
637 // Check object for stored attachment point
638 AttachmentPt = (uint)group.GetAttachmentPoint();
639 }
640
641 // if we still didn't find a suitable attachment point.......
642 if (AttachmentPt == 0)
643 {
644 // Stick it on left hand with Zero Offset from the attachment point.
645 AttachmentPt = (uint)AttachmentPoint.LeftHand;
646 attachPos = Vector3.Zero;
647 }
648
649 group.SetAttachmentPoint((byte)AttachmentPt);
650 group.AbsolutePosition = attachPos;
651
652 // Saves and gets itemID
653 UUID itemId;
654
655 if (group.GetFromItemID() == UUID.Zero)
656 {
657 m_parentScene.attachObjectAssetStore(remoteClient, group, remoteClient.AgentId, out itemId);
658 }
659 else
660 {
661 itemId = group.GetFromItemID();
662 }
663
664 m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group);
665
666 group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent);
667 // In case it is later dropped again, don't let
668 // it get cleaned up
669 //
670 group.RootPart.RemFlag(PrimFlags.TemporaryOnRez);
671 group.HasGroupChanged = false;
672 }
673 else
674 {
675 remoteClient.SendAgentAlertMessage("You don't have sufficient permissions to attach this object", false);
676 return false;
677 }
678 }
679 else
680 {
681 m_log.DebugFormat("[SCENE GRAPH]: AttachObject found no such scene object {0}", objectLocalID);
682 return false;
683 }
684
685 return true;
686 }
687
688 protected internal ScenePresence CreateAndAddChildScenePresence(IClientAPI client, AvatarAppearance appearance) 610 protected internal ScenePresence CreateAndAddChildScenePresence(IClientAPI client, AvatarAppearance appearance)
689 { 611 {
690 ScenePresence newAvatar = null; 612 ScenePresence newAvatar = null;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0134b03..0eee147 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2896,9 +2896,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2896 2896
2897 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 2897 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
2898 2898
2899 m_ScriptEngine.World.AttachObject(presence.ControllingClient, 2899 IAttachmentsModule attachmentsModule = m_ScriptEngine.World.AttachmentsModule;
2900 grp.LocalId, (uint)attachment, Quaternion.Identity, 2900 if (attachmentsModule != null)
2901 Vector3.Zero, false); 2901 attachmentsModule.AttachObject(
2902 presence.ControllingClient, grp.LocalId,
2903 (uint)attachment, Quaternion.Identity, Vector3.Zero, false);
2902 } 2904 }
2903 } 2905 }
2904 2906