diff options
author | UbitUmarov | 2017-07-26 12:58:47 +0100 |
---|---|---|
committer | UbitUmarov | 2017-07-26 12:58:47 +0100 |
commit | 74389c74cba24b3369ccb6908785d030758940b0 (patch) | |
tree | 239ef3dab4157726725f72d65f9df45420ffcbfb /OpenSim/Region/CoreModules | |
parent | avoid leasing issues on lsl_list on domain crossings. This will make their us... (diff) | |
download | opensim-SC_OLD-74389c74cba24b3369ccb6908785d030758940b0.zip opensim-SC_OLD-74389c74cba24b3369ccb6908785d030758940b0.tar.gz opensim-SC_OLD-74389c74cba24b3369ccb6908785d030758940b0.tar.bz2 opensim-SC_OLD-74389c74cba24b3369ccb6908785d030758940b0.tar.xz |
only allow pass renovation on the last quarter of parcel pass time. go back to MoneyMove charging method
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 4123c07..879d3d6 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -592,7 +592,10 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
592 | 592 | ||
593 | currenttime = ldata.ParcelAccessList[idx].Expires - now; | 593 | currenttime = ldata.ParcelAccessList[idx].Expires - now; |
594 | if(currenttime > (int)(0.25f * expires + 0.5f)) | 594 | if(currenttime > (int)(0.25f * expires + 0.5f)) |
595 | currenttime = (int)(0.25f * expires + 0.5f); | 595 | { |
596 | remote_client.SendAgentAlertMessage("You already have pass valid for " + string.Format("{0:0.##} minutes", currenttime/60.0f), false); | ||
597 | return; | ||
598 | } | ||
596 | } | 599 | } |
597 | 600 | ||
598 | LandAccessEntry entry = new LandAccessEntry(); | 601 | LandAccessEntry entry = new LandAccessEntry(); |
@@ -613,12 +616,12 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
613 | return; | 616 | return; |
614 | } | 617 | } |
615 | 618 | ||
616 | // mm.MoveMoney(remote_client.AgentId, ldata.OwnerID, cost, String.Format("Parcel '{0}' pass sell",ldata.Name)); | 619 | mm.MoveMoney(remote_client.AgentId, ldata.OwnerID, cost, String.Format("Parcel '{0}' pass sell",ldata.Name)); |
617 | // lets try older method | 620 | // lets try older method |
618 | EventManager.MoneyTransferArgs args = new EventManager.MoneyTransferArgs(remote_client.AgentId, ldata.OwnerID, | 621 | // EventManager.MoneyTransferArgs args = new EventManager.MoneyTransferArgs(remote_client.AgentId, ldata.OwnerID, |
619 | cost,(int)MoneyTransactionType.LandPassSale , String.Format("Parcel '{0}' pass sell",ldata.Name)); | 622 | // cost,(int)MoneyTransactionType.LandPassSale , String.Format("Parcel '{0}' pass sell",ldata.Name)); |
620 | 623 | ||
621 | m_scene.EventManager.TriggerMoneyTransfer(this, args); | 624 | // m_scene.EventManager.TriggerMoneyTransfer(this, args); |
622 | if (idx != -1) | 625 | if (idx != -1) |
623 | ldata.ParcelAccessList.RemoveAt(idx); | 626 | ldata.ParcelAccessList.RemoveAt(idx); |
624 | ldata.ParcelAccessList.Add(entry); | 627 | ldata.ParcelAccessList.Add(entry); |