diff options
author | Melanie Thielker | 2010-09-06 18:14:24 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-09-06 18:14:24 +0200 |
commit | f4f9a2cb4590fe56e672242b4c5697078785e793 (patch) | |
tree | c9c202e3a034982980800111ce1c7b049d942806 | |
parent | Revert "Workaround for mono bug #312968" (diff) | |
download | opensim-SC_OLD-f4f9a2cb4590fe56e672242b4c5697078785e793.zip opensim-SC_OLD-f4f9a2cb4590fe56e672242b4c5697078785e793.tar.gz opensim-SC_OLD-f4f9a2cb4590fe56e672242b4c5697078785e793.tar.bz2 opensim-SC_OLD-f4f9a2cb4590fe56e672242b4c5697078785e793.tar.xz |
Don't turn off the sale settings on child prims when linking, and on copy
of prims anymore. The behavior now matches SL and can be used to link
vendor prims for transport
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 8823df1..86842b3 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1619,11 +1619,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1619 | 1619 | ||
1620 | if (child != null) | 1620 | if (child != null) |
1621 | { | 1621 | { |
1622 | // Make sure no child prim is set for sale | ||
1623 | // So that, on delink, no prims are unwittingly | ||
1624 | // left for sale and sold off | ||
1625 | child.RootPart.ObjectSaleType = 0; | ||
1626 | child.RootPart.SalePrice = 10; | ||
1627 | childGroups.Add(child); | 1622 | childGroups.Add(child); |
1628 | } | 1623 | } |
1629 | } | 1624 | } |
@@ -1907,9 +1902,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1907 | child.ApplyNextOwnerPermissions(); | 1902 | child.ApplyNextOwnerPermissions(); |
1908 | } | 1903 | } |
1909 | } | 1904 | } |
1910 | |||
1911 | copy.RootPart.ObjectSaleType = 0; | ||
1912 | copy.RootPart.SalePrice = 10; | ||
1913 | } | 1905 | } |
1914 | 1906 | ||
1915 | Entities.Add(copy); | 1907 | Entities.Add(copy); |