diff options
author | Justin Clark-Casey (justincc) | 2011-08-24 22:45:51 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-24 22:45:51 +0100 |
commit | 4b4c5e69e59eb7461ccaa67fd4467e0606ffbe8e (patch) | |
tree | 171d23d7a1af8e0c8b0950163672edc5bde32c2f /OpenSim/Region | |
parent | remove pointless IsDeleted check on SP.RezAttachments() (diff) | |
download | opensim-SC_OLD-4b4c5e69e59eb7461ccaa67fd4467e0606ffbe8e.zip opensim-SC_OLD-4b4c5e69e59eb7461ccaa67fd4467e0606ffbe8e.tar.gz opensim-SC_OLD-4b4c5e69e59eb7461ccaa67fd4467e0606ffbe8e.tar.bz2 opensim-SC_OLD-4b4c5e69e59eb7461ccaa67fd4467e0606ffbe8e.tar.xz |
Remove forcing of phantom on ground attached objects - attachments can be both non-phantom and flagged as physical.
As per Melanie
Diffstat (limited to '')
3 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs index 7b70790..1dd8938 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | |||
@@ -56,8 +56,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
56 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 56 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
57 | public class SimulatorFeaturesModule : ISharedRegionModule, ISimulatorFeaturesModule | 57 | public class SimulatorFeaturesModule : ISharedRegionModule, ISimulatorFeaturesModule |
58 | { | 58 | { |
59 | private static readonly ILog m_log = | 59 | // private static readonly ILog m_log = |
60 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 60 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
61 | 61 | ||
62 | private Scene m_scene; | 62 | private Scene m_scene; |
63 | 63 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 767908e..928d43f 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -669,8 +669,6 @@ 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 | |||
674 | Vector3 inventoryStoredPosition = new Vector3 | 672 | Vector3 inventoryStoredPosition = new Vector3 |
675 | (((grp.AbsolutePosition.X > (int)Constants.RegionSize) | 673 | (((grp.AbsolutePosition.X > (int)Constants.RegionSize) |
676 | ? Constants.RegionSize - 6 | 674 | ? Constants.RegionSize - 6 |
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index 2954933..859f6ff 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -103,7 +103,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
103 | Assert.That(attSo.Name, Is.EqualTo(attName)); | 103 | Assert.That(attSo.Name, Is.EqualTo(attName)); |
104 | Assert.That(attSo.GetAttachmentPoint(), Is.EqualTo((byte)AttachmentPoint.Chest)); | 104 | Assert.That(attSo.GetAttachmentPoint(), Is.EqualTo((byte)AttachmentPoint.Chest)); |
105 | Assert.That(attSo.IsAttachment); | 105 | Assert.That(attSo.IsAttachment); |
106 | Assert.That(attSo.IsPhantom); | ||
107 | Assert.That(attSo.UsesPhysics, Is.False); | 106 | Assert.That(attSo.UsesPhysics, Is.False); |
108 | Assert.That(attSo.IsTemporary, Is.False); | 107 | Assert.That(attSo.IsTemporary, Is.False); |
109 | 108 | ||
@@ -140,7 +139,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
140 | Assert.That(attSo.Name, Is.EqualTo(attName)); | 139 | Assert.That(attSo.Name, Is.EqualTo(attName)); |
141 | Assert.That(attSo.GetAttachmentPoint(), Is.EqualTo((byte)AttachmentPoint.Chest)); | 140 | Assert.That(attSo.GetAttachmentPoint(), Is.EqualTo((byte)AttachmentPoint.Chest)); |
142 | Assert.That(attSo.IsAttachment); | 141 | Assert.That(attSo.IsAttachment); |
143 | Assert.That(attSo.IsPhantom); | ||
144 | Assert.That(attSo.UsesPhysics, Is.False); | 142 | Assert.That(attSo.UsesPhysics, Is.False); |
145 | Assert.That(attSo.IsTemporary, Is.False); | 143 | Assert.That(attSo.IsTemporary, Is.False); |
146 | 144 | ||
@@ -207,7 +205,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
207 | Assert.That(attSo.Name, Is.EqualTo(attName)); | 205 | Assert.That(attSo.Name, Is.EqualTo(attName)); |
208 | Assert.That(attSo.GetAttachmentPoint(), Is.EqualTo((byte)AttachmentPoint.Chest)); | 206 | Assert.That(attSo.GetAttachmentPoint(), Is.EqualTo((byte)AttachmentPoint.Chest)); |
209 | Assert.That(attSo.IsAttachment); | 207 | Assert.That(attSo.IsAttachment); |
210 | Assert.That(attSo.IsPhantom); | ||
211 | Assert.That(attSo.UsesPhysics, Is.False); | 208 | Assert.That(attSo.UsesPhysics, Is.False); |
212 | Assert.That(attSo.IsTemporary, Is.False); | 209 | Assert.That(attSo.IsTemporary, Is.False); |
213 | } | 210 | } |