aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie2011-10-11 21:21:44 +0100
committerMelanie2011-10-11 21:21:44 +0100
commitcc1fe354d01f68add960944ea9ac3cd2feba4c7d (patch)
treee56f163d2ced85420137a811701c153c43f6a5e3 /OpenSim/Region/CoreModules
parentMerge commit 'a4cc5f628f053ad1f9f849addf79551cd58e9337' into bigmerge (diff)
parentrefactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle... (diff)
downloadopensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.zip
opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.gz
opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.bz2
opensim-SC_OLD-cc1fe354d01f68add960944ea9ac3cd2feba4c7d.tar.xz
Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index 49e3236..eb4731c 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
101 101
102 part.ParentGroup.HasGroupChanged = true; 102 part.ParentGroup.HasGroupChanged = true;
103 103
104 part.GetProperties(client); 104 part.SendPropertiesToClient(client);
105 } 105 }
106 106
107 public bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType, int salePrice) 107 public bool BuyObject(IClientAPI remoteClient, UUID categoryID, uint localID, byte saleType, int salePrice)
@@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
142 part.SalePrice = 10; 142 part.SalePrice = 10;
143 143
144 group.HasGroupChanged = true; 144 group.HasGroupChanged = true;
145 part.GetProperties(remoteClient); 145 part.SendPropertiesToClient(remoteClient);
146 part.TriggerScriptChangedEvent(Changed.OWNER); 146 part.TriggerScriptChangedEvent(Changed.OWNER);
147 group.ResumeScripts(); 147 group.ResumeScripts();
148 part.ScheduleFullUpdate(); 148 part.ScheduleFullUpdate();