aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-17 05:07:14 +0000
committerTeravus Ovares2008-04-17 05:07:14 +0000
commit244bfcde5b86180981e99ac9e88eb394f20bcd09 (patch)
treea163db049045c03e475779ce082a3cdfe74aea20 /OpenSim/Region/Environment/Modules
parentmoved the Thread.Sleep(500), to the correct side of the ar.AsyncWaitHandle.... (diff)
downloadopensim-SC_OLD-244bfcde5b86180981e99ac9e88eb394f20bcd09.zip
opensim-SC_OLD-244bfcde5b86180981e99ac9e88eb394f20bcd09.tar.gz
opensim-SC_OLD-244bfcde5b86180981e99ac9e88eb394f20bcd09.tar.bz2
opensim-SC_OLD-244bfcde5b86180981e99ac9e88eb394f20bcd09.tar.xz
* Implements 'Set Home to Here'
* Implements 'Teleport Home' * User Server has to be updated for it to save your home in grid mode * home position accuracy is in int because the grid comms ExpectUser method tries to convert to Uint and crashes if it gets a float. Added a convert to decimal in ExpectUser but to avoid a breaking change with old revisions, kept the save value in int for now. Eventually it needs to be a float, but lets release another incremental version before doing that.
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs20
1 files changed, 12 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
index aef0f81..9727a8b 100644
--- a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs
@@ -423,7 +423,7 @@ namespace OpenSim.Region.Environment.Modules
423 { 423 {
424 if (e.parcelPrice >= 0) 424 if (e.parcelPrice >= 0)
425 { 425 {
426 doMoneyTranfer(agentId, e.parcelOwnerID, e.parcelPrice); 426 doMoneyTransfer(agentId, e.parcelOwnerID, e.parcelPrice);
427 lock (e) 427 lock (e)
428 { 428 {
429 e.transactionID = Util.UnixTimeSinceEpoch(); 429 e.transactionID = Util.UnixTimeSinceEpoch();
@@ -446,13 +446,15 @@ namespace OpenSim.Region.Environment.Modules
446 IClientAPI sender = null; 446 IClientAPI sender = null;
447 IClientAPI receiver = null; 447 IClientAPI receiver = null;
448 448
449 m_log.WarnFormat("[MONEY] Explicit transfer of {0} from {1} to {2}", e.amount, e.sender.ToString(), e.receiver.ToString());
450
449 sender = LocateClientObject(e.sender); 451 sender = LocateClientObject(e.sender);
450 if (sender != null) 452 if (sender != null)
451 { 453 {
452 receiver = LocateClientObject(e.reciever); 454 receiver = LocateClientObject(e.receiver);
453 bool transactionresult = doMoneyTranfer(e.sender, e.reciever, e.amount); 455 bool transactionresult = doMoneyTransfer(e.sender, e.receiver, e.amount);
454 456
455 if (e.sender != e.reciever) 457 if (e.sender != e.receiver)
456 { 458 {
457 if (sender != null) 459 if (sender != null)
458 { 460 {
@@ -462,14 +464,14 @@ namespace OpenSim.Region.Environment.Modules
462 464
463 if (receiver != null) 465 if (receiver != null)
464 { 466 {
465 receiver.SendMoneyBalance(LLUUID.Random(), transactionresult, Helpers.StringToField(e.description), GetFundsForAgentID(e.reciever)); 467 receiver.SendMoneyBalance(LLUUID.Random(), transactionresult, Helpers.StringToField(e.description), GetFundsForAgentID(e.receiver));
466 } 468 }
467 469
468 470
469 } 471 }
470 else 472 else
471 { 473 {
472 m_log.Warn("[MONEY]: Potential Fraud Warning, got money transfer request for avatar that isn't in this simulator - Details; Sender:" + e.sender.ToString() + " Reciver: " + e.reciever.ToString() + " Amount: " + e.amount.ToString()); 474 m_log.Warn("[MONEY]: Potential Fraud Warning, got money transfer request for avatar that isn't in this simulator - Details; Sender:" + e.sender.ToString() + " Reciver: " + e.receiver.ToString() + " Amount: " + e.amount.ToString());
473 } 475 }
474 } 476 }
475 477
@@ -490,7 +492,7 @@ namespace OpenSim.Region.Environment.Modules
490 // Use this to exclude Region Owners (2), Estate Managers(1), Users (0), Disabled(-1) 492 // Use this to exclude Region Owners (2), Estate Managers(1), Users (0), Disabled(-1)
491 if (PriceUpload > 0 && userlevel <= UserLevelPaysFees) 493 if (PriceUpload > 0 && userlevel <= UserLevelPaysFees)
492 { 494 {
493 doMoneyTranfer(Uploader, EconomyBaseAccount, PriceUpload); 495 doMoneyTransfer(Uploader, EconomyBaseAccount, PriceUpload);
494 } 496 }
495 } 497 }
496 498
@@ -634,8 +636,10 @@ namespace OpenSim.Region.Environment.Modules
634 /// <param name="Receiver"></param> 636 /// <param name="Receiver"></param>
635 /// <param name="amount"></param> 637 /// <param name="amount"></param>
636 /// <returns></returns> 638 /// <returns></returns>
637 private bool doMoneyTranfer(LLUUID Sender, LLUUID Receiver, int amount) 639 private bool doMoneyTransfer(LLUUID Sender, LLUUID Receiver, int amount)
638 { 640 {
641 m_log.WarnFormat("[MONEY] Transfer {0} from {1} to {2}", amount, Sender.ToString(), Receiver.ToString());
642
639 bool result = false; 643 bool result = false;
640 if (amount >= 0) 644 if (amount >= 0)
641 { 645 {