OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

only allow pass renovation on the last quarter of parcel pass time. go back to MoneyMove charging method

0.9.0-post-fixes
UbitUmarov 2017-07-26 12:58:47 +01:00
parent d52a64c7a3
commit 74389c74cb
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -592,7 +592,10 @@ namespace OpenSim.Region.CoreModules.World.Land
currenttime = ldata.ParcelAccessList[idx].Expires - now; currenttime = ldata.ParcelAccessList[idx].Expires - now;
if(currenttime > (int)(0.25f * expires + 0.5f)) if(currenttime > (int)(0.25f * expires + 0.5f))
currenttime = (int)(0.25f * expires + 0.5f); {
remote_client.SendAgentAlertMessage("You already have pass valid for " + string.Format("{0:0.##} minutes", currenttime/60.0f), false);
return;
}
} }
LandAccessEntry entry = new LandAccessEntry(); LandAccessEntry entry = new LandAccessEntry();
@ -613,12 +616,12 @@ namespace OpenSim.Region.CoreModules.World.Land
return; return;
} }
// mm.MoveMoney(remote_client.AgentId, ldata.OwnerID, cost, String.Format("Parcel '{0}' pass sell",ldata.Name)); mm.MoveMoney(remote_client.AgentId, ldata.OwnerID, cost, String.Format("Parcel '{0}' pass sell",ldata.Name));
// lets try older method // lets try older method
EventManager.MoneyTransferArgs args = new EventManager.MoneyTransferArgs(remote_client.AgentId, ldata.OwnerID, // EventManager.MoneyTransferArgs args = new EventManager.MoneyTransferArgs(remote_client.AgentId, ldata.OwnerID,
cost,(int)MoneyTransactionType.LandPassSale , String.Format("Parcel '{0}' pass sell",ldata.Name)); // cost,(int)MoneyTransactionType.LandPassSale , String.Format("Parcel '{0}' pass sell",ldata.Name));
m_scene.EventManager.TriggerMoneyTransfer(this, args); // m_scene.EventManager.TriggerMoneyTransfer(this, args);
if (idx != -1) if (idx != -1)
ldata.ParcelAccessList.RemoveAt(idx); ldata.ParcelAccessList.RemoveAt(idx);
ldata.ParcelAccessList.Add(entry); ldata.ParcelAccessList.Add(entry);