diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneEvents.cs | 60 |
3 files changed, 71 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index ebdb0a6..1c36853 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -130,6 +130,15 @@ namespace OpenSim.Region.Environment.Scenes | |||
130 | EventManager.TriggerMoneyTransfer(this, args); | 130 | EventManager.TriggerMoneyTransfer(this, args); |
131 | } | 131 | } |
132 | 132 | ||
133 | public virtual void ProcessParcelBuy(LLUUID agentId, LLUUID groupId, bool final, bool groupOwned, | ||
134 | bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated) | ||
135 | { | ||
136 | EventManager.LandBuyArgs args = new EventManager.LandBuyArgs( | ||
137 | agentId, groupId, final, groupOwned, removeContribution, parcelLocalID, parcelArea, parcelPrice, authenticated); | ||
138 | |||
139 | m_eventManager.TriggerLandBuy(this, args); | ||
140 | } | ||
141 | |||
133 | public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) | 142 | public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) |
134 | { | 143 | { |
135 | 144 | ||
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index f15ec43..410120f 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1001,8 +1001,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1001 | LLVector3 RayEnd = new LLVector3(0, 0, 0); | 1001 | LLVector3 RayEnd = new LLVector3(0, 0, 0); |
1002 | LLVector3 RayStart = new LLVector3(0, 0, 0); | 1002 | LLVector3 RayStart = new LLVector3(0, 0, 0); |
1003 | LLVector3 direction = new LLVector3(0, 0, -1); | 1003 | LLVector3 direction = new LLVector3(0, 0, -1); |
1004 | Vector3 AXOrigin = new Vector3(); | 1004 | //Vector3 AXOrigin = new Vector3(); |
1005 | Vector3 AXdirection = new Vector3(); | 1005 | //Vector3 AXdirection = new Vector3(); |
1006 | Ray testRay = new Ray(); | 1006 | Ray testRay = new Ray(); |
1007 | EntityIntersection rt = new EntityIntersection(); | 1007 | EntityIntersection rt = new EntityIntersection(); |
1008 | 1008 | ||
@@ -1573,6 +1573,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1573 | 1573 | ||
1574 | client.OnGrabObject += ProcessObjectGrab; | 1574 | client.OnGrabObject += ProcessObjectGrab; |
1575 | client.OnMoneyTransferRequest += ProcessMoneyTransferRequest; | 1575 | client.OnMoneyTransferRequest += ProcessMoneyTransferRequest; |
1576 | client.OnParcelBuy += ProcessParcelBuy; | ||
1576 | client.OnAvatarPickerRequest += ProcessAvatarPickerRequest; | 1577 | client.OnAvatarPickerRequest += ProcessAvatarPickerRequest; |
1577 | client.OnPacketStats += AddPacketStats; | 1578 | client.OnPacketStats += AddPacketStats; |
1578 | 1579 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs index 02c9f3f..67edf6b 100644 --- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs +++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs | |||
@@ -176,10 +176,50 @@ namespace OpenSim.Region.Environment.Scenes | |||
176 | } | 176 | } |
177 | } | 177 | } |
178 | 178 | ||
179 | public class LandBuyArgs : System.EventArgs | ||
180 | { | ||
181 | public LLUUID agentId = LLUUID.Zero; | ||
182 | |||
183 | public LLUUID groupId = LLUUID.Zero; | ||
184 | |||
185 | public LLUUID parcelOwnerID = LLUUID.Zero; | ||
186 | |||
187 | public bool final = false; | ||
188 | public bool groupOwned = false; | ||
189 | public bool removeContribution = false; | ||
190 | public int parcelLocalID = 0; | ||
191 | public int parcelArea = 0; | ||
192 | public int parcelPrice = 0; | ||
193 | public bool authenticated = false; | ||
194 | public bool landValidated = false; | ||
195 | public bool economyValidated = false; | ||
196 | public int transactionID = 0; | ||
197 | public int amountDebited = 0; | ||
198 | |||
199 | |||
200 | public LandBuyArgs(LLUUID pagentId, LLUUID pgroupId, bool pfinal, bool pgroupOwned, | ||
201 | bool premoveContribution, int pparcelLocalID, int pparcelArea, int pparcelPrice, | ||
202 | bool pauthenticated) | ||
203 | { | ||
204 | agentId = pagentId; | ||
205 | groupId = pgroupId; | ||
206 | final = pfinal; | ||
207 | groupOwned = pgroupOwned; | ||
208 | removeContribution = premoveContribution; | ||
209 | parcelLocalID = pparcelLocalID; | ||
210 | parcelArea = pparcelArea; | ||
211 | parcelPrice = pparcelPrice; | ||
212 | authenticated = pauthenticated; | ||
213 | } | ||
214 | } | ||
215 | |||
179 | public delegate void MoneyTransferEvent(Object sender, MoneyTransferArgs e); | 216 | public delegate void MoneyTransferEvent(Object sender, MoneyTransferArgs e); |
180 | 217 | ||
181 | public event MoneyTransferEvent OnMoneyTransfer; | 218 | public delegate void LandBuy(Object sender, LandBuyArgs e); |
182 | 219 | ||
220 | public event MoneyTransferEvent OnMoneyTransfer; | ||
221 | public event LandBuy OnLandBuy; | ||
222 | public event LandBuy OnValidatedLandBuy; | ||
183 | 223 | ||
184 | /* Designated Event Deletage Instances */ | 224 | /* Designated Event Deletage Instances */ |
185 | 225 | ||
@@ -212,6 +252,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
212 | private RegisterCapsEvent handlerRegisterCaps = null; // OnRegisterCaps; | 252 | private RegisterCapsEvent handlerRegisterCaps = null; // OnRegisterCaps; |
213 | private DeregisterCapsEvent handlerDeregisterCaps = null; // OnDeregisterCaps; | 253 | private DeregisterCapsEvent handlerDeregisterCaps = null; // OnDeregisterCaps; |
214 | private NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = null; | 254 | private NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = null; |
255 | private LandBuy handlerLandBuy = null; | ||
256 | private LandBuy handlerValidatedLandBuy = null; | ||
215 | 257 | ||
216 | public void TriggerOnScriptChangedEvent(uint localID, uint change) | 258 | public void TriggerOnScriptChangedEvent(uint localID, uint change) |
217 | { | 259 | { |
@@ -476,5 +518,21 @@ namespace OpenSim.Region.Environment.Scenes | |||
476 | handlerNewInventoryItemUpdateComplete(agentID, AssetID, AssetName, userlevel); | 518 | handlerNewInventoryItemUpdateComplete(agentID, AssetID, AssetName, userlevel); |
477 | } | 519 | } |
478 | } | 520 | } |
521 | public void TriggerLandBuy (Object sender, LandBuyArgs e) | ||
522 | { | ||
523 | handlerLandBuy = OnLandBuy; | ||
524 | if (handlerLandBuy != null) | ||
525 | { | ||
526 | handlerLandBuy(sender, e); | ||
527 | } | ||
528 | } | ||
529 | public void TriggerValidatedLandBuy(Object sender, LandBuyArgs e) | ||
530 | { | ||
531 | handlerValidatedLandBuy = OnValidatedLandBuy; | ||
532 | if (handlerValidatedLandBuy != null) | ||
533 | { | ||
534 | handlerValidatedLandBuy(sender, e); | ||
535 | } | ||
536 | } | ||
479 | } | 537 | } |
480 | } | 538 | } |