diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 50f6b71..b6def14 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2809,8 +2809,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2809 | client.OnUndo += m_sceneGraph.HandleUndo; | 2809 | client.OnUndo += m_sceneGraph.HandleUndo; |
2810 | client.OnRedo += m_sceneGraph.HandleRedo; | 2810 | client.OnRedo += m_sceneGraph.HandleRedo; |
2811 | client.OnObjectDescription += m_sceneGraph.PrimDescription; | 2811 | client.OnObjectDescription += m_sceneGraph.PrimDescription; |
2812 | client.OnObjectDrop += m_sceneGraph.DropObject; | 2812 | client.OnObjectDrop += m_sceneGraph.DropObject; |
2813 | client.OnObjectSaleInfo += ObjectSaleInfo; | ||
2814 | client.OnObjectIncludeInSearch += m_sceneGraph.MakeObjectSearchable; | 2813 | client.OnObjectIncludeInSearch += m_sceneGraph.MakeObjectSearchable; |
2815 | client.OnObjectOwner += ObjectOwner; | 2814 | client.OnObjectOwner += ObjectOwner; |
2816 | } | 2815 | } |
@@ -2938,7 +2937,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2938 | client.OnRedo -= m_sceneGraph.HandleRedo; | 2937 | client.OnRedo -= m_sceneGraph.HandleRedo; |
2939 | client.OnObjectDescription -= m_sceneGraph.PrimDescription; | 2938 | client.OnObjectDescription -= m_sceneGraph.PrimDescription; |
2940 | client.OnObjectDrop -= m_sceneGraph.DropObject; | 2939 | client.OnObjectDrop -= m_sceneGraph.DropObject; |
2941 | client.OnObjectSaleInfo -= ObjectSaleInfo; | ||
2942 | client.OnObjectIncludeInSearch -= m_sceneGraph.MakeObjectSearchable; | 2940 | client.OnObjectIncludeInSearch -= m_sceneGraph.MakeObjectSearchable; |
2943 | client.OnObjectOwner -= ObjectOwner; | 2941 | client.OnObjectOwner -= ObjectOwner; |
2944 | } | 2942 | } |
@@ -4488,25 +4486,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
4488 | return inv.NeedSceneCacheClear(agentID, this); | 4486 | return inv.NeedSceneCacheClear(agentID, this); |
4489 | } | 4487 | } |
4490 | 4488 | ||
4491 | public void ObjectSaleInfo(IClientAPI client, UUID agentID, UUID sessionID, uint localID, byte saleType, int salePrice) | ||
4492 | { | ||
4493 | SceneObjectPart part = GetSceneObjectPart(localID); | ||
4494 | if (part == null || part.ParentGroup == null) | ||
4495 | return; | ||
4496 | |||
4497 | if (part.ParentGroup.IsDeleted) | ||
4498 | return; | ||
4499 | |||
4500 | part = part.ParentGroup.RootPart; | ||
4501 | |||
4502 | part.ObjectSaleType = saleType; | ||
4503 | part.SalePrice = salePrice; | ||
4504 | |||
4505 | part.ParentGroup.HasGroupChanged = true; | ||
4506 | |||
4507 | part.GetProperties(client); | ||
4508 | } | ||
4509 | |||
4510 | public bool PerformObjectBuy(IClientAPI remoteClient, UUID categoryID, | 4489 | public bool PerformObjectBuy(IClientAPI remoteClient, UUID categoryID, |
4511 | uint localID, byte saleType) | 4490 | uint localID, byte saleType) |
4512 | { | 4491 | { |