From 9c1c378aa1b8c4f7738514614cdf8e8b870e7263 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 31 Aug 2010 22:16:23 +0100
Subject: Add ScenePresence.GetAttachments(uint attachmentPoint)
---
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index fbb3177..339d0c4 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3383,6 +3383,27 @@ namespace OpenSim.Region.Framework.Scenes
m_attachments.Add(gobj);
}
}
+
+ ///
+ /// Get the scene object attached to the given point.
+ ///
+ ///
+ /// Returns an empty list if there were no attachments at the point.
+ public List GetAttachments(uint attachmentPoint)
+ {
+ List attachments = new List();
+
+ lock (m_attachments)
+ {
+ foreach (SceneObjectGroup so in m_attachments)
+ {
+ if (attachmentPoint == so.RootPart.AttachmentPoint)
+ attachments.Add(so);
+ }
+ }
+
+ return attachments;
+ }
public bool HasAttachments()
{
--
cgit v1.1
From c47de942637281714c3e85bfc8b3af4405713fd3 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 31 Aug 2010 22:24:11 +0200
Subject: Adjust the "Magic numbers" we use because we can't reference the
actual script state enum to reflect recent changes.
---
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 +-
OpenSim/Region/Framework/Scenes/Scene.cs | 2 +-
OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 2ac46e2..0674e62 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1940,7 +1940,7 @@ namespace OpenSim.Region.Framework.Scenes
// We can only call this after adding the scene object, since the scene object references the scene
// to find out if scripts should be activated at all.
- group.CreateScriptInstances(param, true, DefaultScriptEngine, 2);
+ group.CreateScriptInstances(param, true, DefaultScriptEngine, 3);
group.ScheduleGroupForFullUpdate();
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index db081cc..56ac2c2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2376,7 +2376,7 @@ namespace OpenSim.Region.Framework.Scenes
return false;
}
- newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, 1);
+ newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, 2);
newObject.ResumeScripts();
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 2c242c9..e7175c5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1845,7 +1845,7 @@ namespace OpenSim.Region.Framework.Scenes
copy.UpdateGroupRotationR(rot);
}
- copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 0);
+ copy.CreateScriptInstances(0, false, m_parentScene.DefaultScriptEngine, 1);
copy.HasGroupChanged = true;
copy.ScheduleGroupForFullUpdate();
copy.ResumeScripts();
--
cgit v1.1
From 6cbf66827ba3cb878ab70b75fc4e3221b71d820e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 1 Sep 2010 01:11:52 +0100
Subject: refactor: move SOG.AttachToAgent() into AttachmentsModule
---
.../Region/Framework/Scenes/SceneObjectGroup.cs | 71 ----------------------
1 file changed, 71 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 40a8f83..64a6dd5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -977,77 +977,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- ///
- /// Attach this scene object to the given avatar.
- ///
- ///
- ///
- ///
- public void AttachToAgent(UUID agentID, uint attachmentpoint, Vector3 AttachOffset, bool silent)
- {
- ScenePresence avatar = m_scene.GetScenePresence(agentID);
- if (avatar != null)
- {
- // don't attach attachments to child agents
- if (avatar.IsChildAgent) return;
-
-// m_log.DebugFormat("[SOG]: Adding attachment {0} to avatar {1}", Name, avatar.Name);
-
- DetachFromBackup();
-
- // Remove from database and parcel prim count
- m_scene.DeleteFromStorage(UUID);
- m_scene.EventManager.TriggerParcelPrimCountTainted();
-
- m_rootPart.AttachedAvatar = agentID;
-
- //Anakin Lohner bug #3839
- lock (m_parts)
- {
- foreach (SceneObjectPart p in m_parts.Values)
- {
- p.AttachedAvatar = agentID;
- }
- }
-
- if (m_rootPart.PhysActor != null)
- {
- m_scene.PhysicsScene.RemovePrim(m_rootPart.PhysActor);
- m_rootPart.PhysActor = null;
- }
-
- AbsolutePosition = AttachOffset;
- m_rootPart.AttachedPos = AttachOffset;
- m_rootPart.IsAttachment = true;
-
- m_rootPart.SetParentLocalId(avatar.LocalId);
- SetAttachmentPoint(Convert.ToByte(attachmentpoint));
-
- avatar.AddAttachment(this);
-
- if (!silent)
- {
- // Killing it here will cause the client to deselect it
- // It then reappears on the avatar, deselected
- // through the full update below
- //
- if (IsSelected)
- {
- m_scene.SendKillObject(m_rootPart.LocalId);
- }
-
- IsSelected = false; // fudge....
- ScheduleGroupForFullUpdate();
- }
- }
- else
- {
- m_log.WarnFormat(
- "[SOG]: Tried to add attachment {0} to avatar with UUID {1} in region {2} but the avatar is not present",
- UUID, agentID, Scene.RegionInfo.RegionName);
- }
- }
-
public byte GetAttachmentPoint()
{
return m_rootPart.Shape.State;
--
cgit v1.1
From 7720419fc7e74758125dc401eb3258ba5bd9b4f8 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 2 Sep 2010 20:08:39 +0200
Subject: Experimentally comment the sending of unbaked avatars
---
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 339d0c4..facbc97 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2464,7 +2464,9 @@ namespace OpenSim.Region.Framework.Scenes
m_controllingClient.SendAvatarDataImmediate(this);
SendInitialFullUpdateToAllClients();
- SendAppearanceToAllOtherAgents();
+ // Experimentally commenting this. We don't have bakes at this time
+ // and 1.23 will not display an avatar without bakes.
+ //SendAppearanceToAllOtherAgents();
}
///
--
cgit v1.1
From 1c8bc9b7b6a62b38d9378ec08853ab2237c7a53a Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 2 Sep 2010 20:51:27 +0200
Subject: Remove commented code and the comment, as the change has proven out
---
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 ---
1 file changed, 3 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index facbc97..cc9355e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2464,9 +2464,6 @@ namespace OpenSim.Region.Framework.Scenes
m_controllingClient.SendAvatarDataImmediate(this);
SendInitialFullUpdateToAllClients();
- // Experimentally commenting this. We don't have bakes at this time
- // and 1.23 will not display an avatar without bakes.
- //SendAppearanceToAllOtherAgents();
}
///
--
cgit v1.1
From 457160afc3cc0878b068486a7cbb8a41a5f18520 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 3 Sep 2010 03:16:08 +0200
Subject: Fix an issue with rezzing scripted objects.
---
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index c5994b2..1959427 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -278,7 +278,7 @@ namespace OpenSim.Region.Framework.Scenes
if (!m_part.ParentGroup.Scene.RegionInfo.RegionSettings.DisableScripts)
{
- if (stateSource == 1 && // Prim crossing
+ if (stateSource == 2 && // Prim crossing
m_part.ParentGroup.Scene.m_trustBinaries)
{
m_items.LockItemsForWrite(true);
@@ -1263,4 +1263,4 @@ namespace OpenSim.Region.Framework.Scenes
Items.LockItemsForRead(false);
}
}
-}
\ No newline at end of file
+}
--
cgit v1.1
From 17a26c3701f7e8de8a4fc223c2069798223b245d Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 3 Sep 2010 03:16:08 +0200
Subject: Fix an issue with rezzing scripted objects.
---
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index d7767bd..ca089a1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -252,7 +252,7 @@ namespace OpenSim.Region.Framework.Scenes
if (!m_part.ParentGroup.Scene.RegionInfo.RegionSettings.DisableScripts)
{
- if (stateSource == 1 && // Prim crossing
+ if (stateSource == 2 && // Prim crossing
m_part.ParentGroup.Scene.m_trustBinaries)
{
lock (m_items)
@@ -1095,4 +1095,4 @@ namespace OpenSim.Region.Framework.Scenes
}
}
}
-}
\ No newline at end of file
+}
--
cgit v1.1
From 107052b23db4d16c8d1d5f8c828da7d6f6afd6b4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 4 Sep 2010 00:09:53 +0100
Subject: Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)
The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated.
---
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 35 +++++++++++++++++-----
1 file changed, 27 insertions(+), 8 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 0674e62..7cedde0 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -92,25 +92,44 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- public void AddInventoryItem(UUID AgentID, InventoryItemBase item)
+ ///
+ /// Add the given inventory item to a user's inventory.
+ ///
+ ///
+ public void AddInventoryItem(InventoryItemBase item)
{
if (InventoryService.AddItem(item))
{
int userlevel = 0;
- if (Permissions.IsGod(AgentID))
+ if (Permissions.IsGod(item.Owner))
{
userlevel = 1;
}
- EventManager.TriggerOnNewInventoryItemUploadComplete(AgentID, item.AssetID, item.Name, userlevel);
+ EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, item.AssetID, item.Name, userlevel);
}
else
{
m_log.WarnFormat(
"[AGENT INVENTORY]: Agent {0} could not add item {1} {2}",
- AgentID, item.Name, item.ID);
+ item.Owner, item.Name, item.ID);
return;
- }
+ }
+ }
+
+ ///
+ /// Add the given inventory item to a user's inventory.
+ ///
+ ///
+ /// A
+ ///
+ ///
+ /// A
+ ///
+ [Obsolete("Use AddInventoryItem(InventoryItemBase item) instead. This was deprecated in OpenSim 0.7.1")]
+ public void AddInventoryItem(UUID AgentID, InventoryItemBase item)
+ {
+ AddInventoryItem(item);
}
///
@@ -121,7 +140,7 @@ namespace OpenSim.Region.Framework.Scenes
/// in which the item is to be placed.
public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item)
{
- AddInventoryItem(remoteClient.AgentId, item);
+ AddInventoryItem(item);
remoteClient.SendInventoryItemCreateUpdate(item, 0);
}
@@ -1108,7 +1127,7 @@ namespace OpenSim.Region.Framework.Scenes
agentItem.Folder = folderId;
- AddInventoryItem(avatarId, agentItem);
+ AddInventoryItem(agentItem);
return agentItem;
}
@@ -1232,7 +1251,7 @@ namespace OpenSim.Region.Framework.Scenes
{
agentItem.Folder = newFolderID;
- AddInventoryItem(destID, agentItem);
+ AddInventoryItem(agentItem);
}
}
--
cgit v1.1
From 1e8e98a07fdad6cff4be780083b3d9ad2360b8e7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 4 Sep 2010 01:36:26 +0100
Subject: Move code that allows llGiveInvetory() to move item into appropriate
system folder up from connectors into Scene.Inventory.cs
This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors.
Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway.
---
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 48 ++++++++++++++++++----
1 file changed, 40 insertions(+), 8 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 7cedde0..4e871d9 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -70,18 +70,18 @@ namespace OpenSim.Region.Framework.Scenes
public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item)
{
- IMoneyModule money=RequestModuleInterface();
+ IMoneyModule money = RequestModuleInterface();
if (money != null)
{
money.ApplyUploadCharge(agentID, money.UploadCharge, "Asset upload");
}
- AddInventoryItem(agentID, item);
+ AddInventoryItem(item);
}
public bool AddInventoryItemReturned(UUID AgentId, InventoryItemBase item)
{
- if (InventoryService.AddItem(item))
+ if (AddInventoryItem(item))
return true;
else
{
@@ -96,8 +96,36 @@ namespace OpenSim.Region.Framework.Scenes
/// Add the given inventory item to a user's inventory.
///
///
- public void AddInventoryItem(InventoryItemBase item)
+ public bool AddInventoryItem(InventoryItemBase item)
{
+ if (UUID.Zero == item.Folder)
+ {
+ InventoryFolderBase f = InventoryService.GetFolderForType(item.Owner, (AssetType)item.AssetType);
+ if (f != null)
+ {
+// m_log.DebugFormat(
+// "[LOCAL INVENTORY SERVICES CONNECTOR]: Found folder {0} type {1} for item {2}",
+// f.Name, (AssetType)f.Type, item.Name);
+
+ item.Folder = f.ID;
+ }
+ else
+ {
+ f = InventoryService.GetRootFolder(item.Owner);
+ if (f != null)
+ {
+ item.Folder = f.ID;
+ }
+ else
+ {
+ m_log.WarnFormat(
+ "[AGENT INVENTORY]: Could not find root folder for {0} when trying to add item {1} with no parent folder specified",
+ item.Owner, item.Name);
+ return false;
+ }
+ }
+ }
+
if (InventoryService.AddItem(item))
{
int userlevel = 0;
@@ -106,6 +134,8 @@ namespace OpenSim.Region.Framework.Scenes
userlevel = 1;
}
EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, item.AssetID, item.Name, userlevel);
+
+ return true;
}
else
{
@@ -113,7 +143,7 @@ namespace OpenSim.Region.Framework.Scenes
"[AGENT INVENTORY]: Agent {0} could not add item {1} {2}",
item.Owner, item.Name, item.ID);
- return;
+ return false;
}
}
@@ -538,7 +568,7 @@ namespace OpenSim.Region.Framework.Scenes
itemCopy.SalePrice = item.SalePrice;
itemCopy.SaleType = item.SaleType;
- if (InventoryService.AddItem(itemCopy))
+ if (AddInventoryItem(itemCopy))
{
IInventoryAccessModule invAccess = RequestModuleInterface();
if (invAccess != null)
@@ -764,8 +794,10 @@ namespace OpenSim.Region.Framework.Scenes
item.BasePermissions = baseMask;
item.CreationDate = creationDate;
- if (InventoryService.AddItem(item))
+ if (AddInventoryItem(item))
+ {
remoteClient.SendInventoryItemCreateUpdate(item, callbackID);
+ }
else
{
m_dialogModule.SendAlertToUser(remoteClient, "Failed to create item");
@@ -1886,7 +1918,7 @@ namespace OpenSim.Region.Framework.Scenes
// sets itemID so client can show item as 'attached' in inventory
grp.SetFromItemID(item.ID);
- if (InventoryService.AddItem(item))
+ if (AddInventoryItem(item))
remoteClient.SendInventoryItemCreateUpdate(item, 0);
else
m_dialogModule.SendAlertToUser(remoteClient, "Operation failed");
--
cgit v1.1
From 68f107b27e37df88618993b8234316288782d15e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 4 Sep 2010 18:46:27 -0700
Subject: Logout the presence if client IP verification fails.
---
OpenSim/Region/Framework/Scenes/Scene.cs | 2 ++
1 file changed, 2 insertions(+)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 56ac2c2..49f29ad 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2643,6 +2643,8 @@ namespace OpenSim.Region.Framework.Scenes
try
{
ScenePresence sp = GetScenePresence(agentID);
+ PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
+
if (sp != null)
sp.ControllingClient.Close();
--
cgit v1.1
From 00a23eea0ec5d3607cf9cd021a3a182da258686e Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 6 Sep 2010 03:59:48 +0200
Subject: Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager,
because modules need to see it (Search!) even if it comes in via CAPS
---
OpenSim/Region/Framework/Scenes/EventManager.cs | 26 ++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework/Scenes')
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 52e6e92..d4e2736 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -113,6 +113,8 @@ namespace OpenSim.Region.Framework.Scenes
public event OnSetRootAgentSceneDelegate OnSetRootAgentScene;
+ public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
+
///
/// Fired when an object is touched/grabbed.
///
@@ -2128,5 +2130,27 @@ namespace OpenSim.Region.Framework.Scenes
}
}
}
+
+ public void TriggerOnParcelPropertiesUpdateRequest(LandUpdateArgs args,
+ int local_id, IClientAPI remote_client)
+ {
+ ParcelPropertiesUpdateRequest handler = OnParcelPropertiesUpdateRequest;
+ if (handler != null)
+ {
+ foreach (ParcelPropertiesUpdateRequest d in handler.GetInvocationList())
+ {
+ try
+ {
+ d(args, local_id, remote_client);
+ }
+ catch (Exception e)
+ {
+ m_log.ErrorFormat(
+ "[EVENT MANAGER]: Delegate for TriggerOnSceneObjectPartCopy failed - continuing. {0} {1}",
+ e.Message, e.StackTrace);
+ }
+ }
+ }
+ }
}
-}
\ No newline at end of file
+}
--
cgit v1.1
From f4f9a2cb4590fe56e672242b4c5697078785e793 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 6 Sep 2010 18:14:24 +0200
Subject: 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
---
OpenSim/Region/Framework/Scenes/SceneGraph.cs | 8 --------
1 file changed, 8 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes')
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
if (child != null)
{
- // Make sure no child prim is set for sale
- // So that, on delink, no prims are unwittingly
- // left for sale and sold off
- child.RootPart.ObjectSaleType = 0;
- child.RootPart.SalePrice = 10;
childGroups.Add(child);
}
}
@@ -1907,9 +1902,6 @@ namespace OpenSim.Region.Framework.Scenes
child.ApplyNextOwnerPermissions();
}
}
-
- copy.RootPart.ObjectSaleType = 0;
- copy.RootPart.SalePrice = 10;
}
Entities.Add(copy);
--
cgit v1.1