diff options
author | Justin Clark-Casey (justincc) | 2010-08-13 21:39:43 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-13 21:39:43 +0100 |
commit | b30635a454a2d4c8753023efaeb41118be1ef40e (patch) | |
tree | d94750d991c270eb9662a572f316c86259dcf978 /OpenSim | |
parent | minor: remove mono compiler warning (diff) | |
download | opensim-SC-b30635a454a2d4c8753023efaeb41118be1ef40e.zip opensim-SC-b30635a454a2d4c8753023efaeb41118be1ef40e.tar.gz opensim-SC-b30635a454a2d4c8753023efaeb41118be1ef40e.tar.bz2 opensim-SC-b30635a454a2d4c8753023efaeb41118be1ef40e.tar.xz |
Establish new Objects/BuySellModule
Move Scene.ObjectSaleInfo() to this
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | 98 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 23 |
2 files changed, 99 insertions, 22 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs new file mode 100644 index 0000000..326eea9 --- /dev/null +++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | |||
@@ -0,0 +1,98 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Reflection; | ||
31 | using log4net; | ||
32 | using Mono.Addins; | ||
33 | using Nini.Config; | ||
34 | using OpenMetaverse; | ||
35 | using OpenMetaverse.Packets; | ||
36 | using OpenSim.Framework; | ||
37 | using OpenSim.Region.Framework; | ||
38 | using OpenSim.Region.Framework.Interfaces; | ||
39 | using OpenSim.Region.Framework.Scenes; | ||
40 | |||
41 | namespace OpenSim.Region.CoreModules.World.Objects.BuySell | ||
42 | { | ||
43 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BuySellModule")] | ||
44 | public class BuySellModule : INonSharedRegionModule | ||
45 | { | ||
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
47 | |||
48 | protected Scene m_scene = null; | ||
49 | |||
50 | public string Name { get { return "Object BuySell Module"; } } | ||
51 | public Type ReplaceableInterface { get { return null; } } | ||
52 | |||
53 | public void Initialise(IConfigSource source) {} | ||
54 | |||
55 | public void AddRegion(Scene scene) | ||
56 | { | ||
57 | m_scene = scene; | ||
58 | m_scene.EventManager.OnNewClient += SubscribeToClientEvents; | ||
59 | } | ||
60 | |||
61 | public void RemoveRegion(Scene scene) | ||
62 | { | ||
63 | m_scene.EventManager.OnNewClient -= SubscribeToClientEvents; | ||
64 | } | ||
65 | |||
66 | public void RegionLoaded(Scene scene) {} | ||
67 | |||
68 | public void Close() | ||
69 | { | ||
70 | RemoveRegion(m_scene); | ||
71 | } | ||
72 | |||
73 | public void SubscribeToClientEvents(IClientAPI client) | ||
74 | { | ||
75 | client.OnObjectSaleInfo += ObjectSaleInfo; | ||
76 | } | ||
77 | |||
78 | protected void ObjectSaleInfo( | ||
79 | IClientAPI client, UUID agentID, UUID sessionID, uint localID, byte saleType, int salePrice) | ||
80 | { | ||
81 | SceneObjectPart part = m_scene.GetSceneObjectPart(localID); | ||
82 | if (part == null || part.ParentGroup == null) | ||
83 | return; | ||
84 | |||
85 | if (part.ParentGroup.IsDeleted) | ||
86 | return; | ||
87 | |||
88 | part = part.ParentGroup.RootPart; | ||
89 | |||
90 | part.ObjectSaleType = saleType; | ||
91 | part.SalePrice = salePrice; | ||
92 | |||
93 | part.ParentGroup.HasGroupChanged = true; | ||
94 | |||
95 | part.GetProperties(client); | ||
96 | } | ||
97 | } | ||
98 | } \ No newline at end of file | ||
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 | { |