diff options
| author | Melanie | 2012-08-14 02:11:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-14 02:11:13 +0100 |
| commit | 053e7279ca5d9be8f2ae2f79d0a2c74ab056f147 (patch) | |
| tree | 772fd824cbbe5a6bc594875ac3ee03c00115cef5 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Implement the temp attachments. UNTESTED (diff) | |
| download | opensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.zip opensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.gz opensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.bz2 opensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index a8594e4..a29b4fd 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2755,7 +2755,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2755 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2755 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
| 2756 | 2756 | ||
| 2757 | if (AttachmentsModule != null) | 2757 | if (AttachmentsModule != null) |
| 2758 | AttachmentsModule.AttachObject(sp, grp, 0, false, false); | 2758 | AttachmentsModule.AttachObject(sp, grp, 0, false, false, false); |
| 2759 | } | 2759 | } |
| 2760 | else | 2760 | else |
| 2761 | { | 2761 | { |