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/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
| 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 '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 2 |
1 files changed, 0 insertions, 2 deletions
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 |