diff options
| author | Melanie | 2013-03-06 00:15:54 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-06 00:15:54 +0000 |
| commit | 339d8ef2a657dd08bc6328da6e285b8550d05a74 (patch) | |
| tree | 612080502d4da19051a2fcc8dfb7ff26a90fbfa7 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Limit each attachment point to 5 items as per spec (diff) | |
| download | opensim-SC_OLD-339d8ef2a657dd08bc6328da6e285b8550d05a74.zip opensim-SC_OLD-339d8ef2a657dd08bc6328da6e285b8550d05a74.tar.gz opensim-SC_OLD-339d8ef2a657dd08bc6328da6e285b8550d05a74.tar.bz2 opensim-SC_OLD-339d8ef2a657dd08bc6328da6e285b8550d05a74.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.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 d459b56..92d0aff 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2863,7 +2863,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2863 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2863 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
| 2864 | 2864 | ||
| 2865 | if (AttachmentsModule != null) | 2865 | if (AttachmentsModule != null) |
| 2866 | AttachmentsModule.AttachObject(sp, grp, 0, false, false, false); | 2866 | AttachmentsModule.AttachObject(sp, grp, 0, false, false, false, true); |
| 2867 | } | 2867 | } |
| 2868 | else | 2868 | else |
| 2869 | { | 2869 | { |