aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-24 22:12:51 +0100
committerJustin Clark-Casey (justincc)2011-08-24 22:12:51 +0100
commit73d913dad25dc1680f66ed2acc32cc6eb672da6b (patch)
tree50bdf96dc36f016607947584a7ebba4aaf1e71ee
parentadd SOG helper properties IsPhantom, IsTemporary, etc. to improve code readab... (diff)
downloadopensim-SC_OLD-73d913dad25dc1680f66ed2acc32cc6eb672da6b.zip
opensim-SC_OLD-73d913dad25dc1680f66ed2acc32cc6eb672da6b.tar.gz
opensim-SC_OLD-73d913dad25dc1680f66ed2acc32cc6eb672da6b.tar.bz2
opensim-SC_OLD-73d913dad25dc1680f66ed2acc32cc6eb672da6b.tar.xz
Make objects attached from the ground phantom
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs12
2 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 928d43f..767908e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -669,6 +669,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
669 { 669 {
670// m_log.DebugFormat("[SCENE]: Called AddSceneObjectAsAttachment for object {0} {1} for {2} {3} {4}", grp.Name, grp.LocalId, remoteClient.Name, remoteClient.AgentId, AgentId); 670// m_log.DebugFormat("[SCENE]: Called AddSceneObjectAsAttachment for object {0} {1} for {2} {3} {4}", grp.Name, grp.LocalId, remoteClient.Name, remoteClient.AgentId, AgentId);
671 671
672 grp.UpdatePrimFlags(grp.LocalId, grp.UsesPhysics, grp.IsTemporary, true, grp.IsVolumeDetect);
673
672 Vector3 inventoryStoredPosition = new Vector3 674 Vector3 inventoryStoredPosition = new Vector3
673 (((grp.AbsolutePosition.X > (int)Constants.RegionSize) 675 (((grp.AbsolutePosition.X > (int)Constants.RegionSize)
674 ? Constants.RegionSize - 6 676 ? Constants.RegionSize - 6
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index b4ff055..9ea6a16 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -97,6 +97,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
97 97
98 SceneObjectGroup attSo = scene.GetSceneObjectGroup(so.UUID); 98 SceneObjectGroup attSo = scene.GetSceneObjectGroup(so.UUID);
99 Assert.That(attSo.IsAttachment); 99 Assert.That(attSo.IsAttachment);
100 Assert.That(attSo.IsPhantom);
101 Assert.That(attSo.UsesPhysics, Is.False);
102 Assert.That(attSo.IsTemporary, Is.False);
100 103
101 // Check status on scene presence 104 // Check status on scene presence
102 Assert.That(presence.HasAttachments(), Is.True); 105 Assert.That(presence.HasAttachments(), Is.True);
@@ -134,8 +137,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
134 Assert.That(presence.HasAttachments(), Is.True); 137 Assert.That(presence.HasAttachments(), Is.True);
135 List<SceneObjectGroup> attachments = presence.Attachments; 138 List<SceneObjectGroup> attachments = presence.Attachments;
136 Assert.That(attachments.Count, Is.EqualTo(1)); 139 Assert.That(attachments.Count, Is.EqualTo(1));
137 Assert.That(attachments[0].Name, Is.EqualTo(attName)); 140 SceneObjectGroup attSo = attachments[0];
138 Assert.That(attachments[0].GetAttachmentPoint(), Is.EqualTo((byte)AttachmentPoint.Chest)); 141 Assert.That(attSo.Name, Is.EqualTo(attName));
142 Assert.That(attSo.GetAttachmentPoint(), Is.EqualTo((byte)AttachmentPoint.Chest));
143 Assert.That(attSo.IsAttachment);
144 Assert.That(attSo.IsPhantom);
145 Assert.That(attSo.UsesPhysics, Is.False);
146 Assert.That(attSo.IsTemporary, Is.False);
139 147
140 // Check item status 148 // Check item status
141 Assert.That(presence.Appearance.GetAttachpoint(attItemId), Is.EqualTo((int)AttachmentPoint.Chest)); 149 Assert.That(presence.Appearance.GetAttachpoint(attItemId), Is.EqualTo((int)AttachmentPoint.Chest));