diff --git a/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs
index 7d7910219e..0ea49e91b4 100644
--- a/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/ReplaceableModules/MoneyModule/SampleMoneyModule.cs
@@ -28,10 +28,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
using System.Reflection;
-using System.Xml;
using log4net;
using Nini.Config;
using Nwc.XmlRpc;
@@ -45,15 +42,14 @@ using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.ReplaceableModules.MoneyModule
{
///
- /// Demo Economy/Money Module. This is not a production quality money/economy module!
- /// This is a demo for you to use when making one that works for you.
- /// // To use the following you need to add:
- /// -helperuri
+ /// This is only the functionality required to make the functionality associated with money work
+ /// (such as land transfers). There is no money code here! Use FORGE as an example for money code.
+ /// Demo Economy/Money Module. This is a purposely crippled module!
+ /// // To land transfer you need to add:
+ /// -helperuri
/// to the command line parameters you use to start up your client
/// This commonly looks like -helperuri http://127.0.0.1:9000/
///
- /// Centralized grid structure example using OpenSimWi Redux revision 9+
- /// svn co https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux
///
public class SampleMoneyModule : IMoneyModule, IRegionModule
{
@@ -71,17 +67,11 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
private IConfigSource m_gConfig;
- private bool m_keepMoneyAcrossLogins = true;
- private Dictionary m_KnownClientFunds = new Dictionary();
- // private string m_LandAddress = String.Empty;
- private int m_minFundsBeforeRefresh = 100;
- private string m_MoneyAddress = String.Empty;
///
/// Region UUIDS indexed by AgentID
///
- private Dictionary m_rootAgents = new Dictionary();
///
/// Scenes by Region Handle
@@ -107,8 +97,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
private int TeleportMinPrice = 0;
private float TeleportPriceExponent = 0f;
- // private int UserLevelPaysFees = 2;
- // private Scene XMLRPCHandler;
+
#region IMoneyModule Members
@@ -146,21 +135,13 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
// to the command line parameters you use to start up your client
// This commonly looks like -helperuri http://127.0.0.1:9000/
- if (m_MoneyAddress.Length > 0)
- {
- // Centralized grid structure using OpenSimWi Redux revision 9+
- // https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux
- httpServer.AddXmlRPCHandler("balanceUpdateRequest", GridMoneyUpdate);
- httpServer.AddXmlRPCHandler("userAlert", UserAlert);
- }
- else
- {
- // Local Server.. enables functionality only.
- httpServer.AddXmlRPCHandler("getCurrencyQuote", quote_func);
- httpServer.AddXmlRPCHandler("buyCurrency", buy_func);
- httpServer.AddXmlRPCHandler("preflightBuyLandPrep", preflightBuyLandPrep_func);
- httpServer.AddXmlRPCHandler("buyLandPrep", landBuy_func);
- }
+
+ // Local Server.. enables functionality only.
+ httpServer.AddXmlRPCHandler("getCurrencyQuote", quote_func);
+ httpServer.AddXmlRPCHandler("buyCurrency", buy_func);
+ httpServer.AddXmlRPCHandler("preflightBuyLandPrep", preflightBuyLandPrep_func);
+ httpServer.AddXmlRPCHandler("buyLandPrep", landBuy_func);
+
}
if (m_scenel.ContainsKey(scene.RegionInfo.RegionHandle))
@@ -205,8 +186,8 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
bool give_result = doMoneyTransfer(fromID, toID, amount, 2, description);
- if (m_MoneyAddress.Length == 0)
- BalanceUpdate(fromID, toID, give_result, description);
+
+ BalanceUpdate(fromID, toID, give_result, description);
return give_result;
}
@@ -268,9 +249,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
// UserLevelPaysFees = startupConfig.GetInt("UserLevelPaysFees", -1);
m_stipend = startupConfig.GetInt("UserStipend", 1000);
- m_minFundsBeforeRefresh = startupConfig.GetInt("IssueStipendWhenClientIsBelowAmount", 10);
- m_keepMoneyAcrossLogins = startupConfig.GetBoolean("KeepMoneyAcrossLogins", true);
- m_MoneyAddress = startupConfig.GetString("CurrencyServer", String.Empty);
+
// m_LandAddress = startupConfig.GetString("LandServer", String.Empty);
}
@@ -307,65 +286,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
if (gridmode)
{
- if (m_MoneyAddress.Length == 0)
- {
- CheckExistAndRefreshFunds(client.AgentId);
- }
- else
- {
- bool childYN = true;
- ScenePresence agent = null;
- //client.SecureSessionId;
- Scene s = LocateSceneClientIn(client.AgentId);
- if (s != null)
- {
- agent = s.GetScenePresence(client.AgentId);
- if (agent != null)
- childYN = agent.IsChildAgent;
- }
- if (s != null && agent != null && childYN == false)
- {
- //s.RegionInfo.RegionHandle;
- UUID agentID = UUID.Zero;
- int funds = 0;
-
- Hashtable hbinfo =
- GetBalanceForUserFromMoneyServer(client.AgentId, client.SecureSessionId, s.RegionInfo.originRegionID,
- s.RegionInfo.regionSecret);
- if ((bool) hbinfo["success"] == true)
- {
- UUID.TryParse((string)hbinfo["agentId"], out agentID);
- try
- {
- funds = (Int32) hbinfo["funds"];
- }
- catch (ArgumentException)
- {
- }
- catch (FormatException)
- {
- }
- catch (OverflowException)
- {
- m_log.ErrorFormat("[MONEY]: While getting the Currency for user {0}, the return funds overflowed.", agentID);
- client.SendAlertMessage("Unable to get your money balance, money operations will be unavailable");
- }
- catch (InvalidCastException)
- {
- funds = 0;
- }
-
- m_KnownClientFunds[agentID] = funds;
- }
- else
- {
- m_log.WarnFormat("[MONEY]: Getting Money for user {0} failed with the following message:{1}", agentID,
- (string) hbinfo["errorMessage"]);
- client.SendAlertMessage((string) hbinfo["errorMessage"]);
- }
- SendMoneyBalance(client, agentID, client.SessionId, UUID.Zero);
- }
- }
+ CheckExistAndRefreshFunds(client.AgentId);
}
else
{
@@ -399,53 +320,8 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
///
private bool doMoneyTransfer(UUID Sender, UUID Receiver, int amount, int transactiontype, string description)
{
- bool result = false;
- if (amount >= 0)
- {
- lock (m_KnownClientFunds)
- {
- // If we don't know about the sender, then the sender can't
- // actually be here and therefore this is likely fraud or outdated.
- if (m_MoneyAddress.Length == 0)
- {
- if (m_KnownClientFunds.ContainsKey(Sender))
- {
- // Does the sender have enough funds to give?
- if (m_KnownClientFunds[Sender] >= amount)
- {
- // Subtract the funds from the senders account
- m_KnownClientFunds[Sender] -= amount;
-
- // do we know about the receiver?
- if (!m_KnownClientFunds.ContainsKey(Receiver))
- {
- // Make a record for them so they get the updated balance when they login
- CheckExistAndRefreshFunds(Receiver);
- }
- if (m_enabled)
- {
- //Add the amount to the Receiver's funds
- m_KnownClientFunds[Receiver] += amount;
- result = true;
- }
- }
- else
- {
- // These below are redundant to make this clearer to read
- result = false;
- }
- }
- else
- {
- result = false;
- }
- }
- else
- {
- result = TransferMoneyonMoneyServer(Sender, Receiver, amount, transactiontype, description);
- }
- }
- }
+ bool result = true;
+
return result;
}
@@ -480,126 +356,6 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
}
}
- ///
- /// Gets the current balance for the user from the Grid Money Server
- ///
- ///
- ///
- ///
- ///
- ///
- public Hashtable GetBalanceForUserFromMoneyServer(UUID agentId, UUID secureSessionID, UUID regionId, string regionSecret)
- {
- Hashtable MoneyBalanceRequestParams = new Hashtable();
- MoneyBalanceRequestParams["agentId"] = agentId.ToString();
- MoneyBalanceRequestParams["secureSessionId"] = secureSessionID.ToString();
- MoneyBalanceRequestParams["regionId"] = regionId.ToString();
- MoneyBalanceRequestParams["secret"] = regionSecret;
- MoneyBalanceRequestParams["currencySecret"] = ""; // per - region/user currency secret gotten from the money system
-
- Hashtable MoneyRespData = genericCurrencyXMLRPCRequest(MoneyBalanceRequestParams, "simulatorUserBalanceRequest");
-
- return MoneyRespData;
- }
-
-
- ///
- /// Generic XMLRPC client abstraction
- ///
- /// Hashtable containing parameters to the method
- /// Method to invoke
- /// Hashtable with success=>bool and other values
- public Hashtable genericCurrencyXMLRPCRequest(Hashtable ReqParams, string method)
- {
- ArrayList SendParams = new ArrayList();
- SendParams.Add(ReqParams);
- // Send Request
- XmlRpcResponse MoneyResp;
- try
- {
- XmlRpcRequest BalanceRequestReq = new XmlRpcRequest(method, SendParams);
- MoneyResp = BalanceRequestReq.Send(m_MoneyAddress, 30000);
- }
- catch (WebException ex)
- {
- m_log.ErrorFormat(
- "[MONEY]: Unable to connect to Money Server {0}. Exception {1}",
- m_MoneyAddress, ex);
-
- Hashtable ErrorHash = new Hashtable();
- ErrorHash["success"] = false;
- ErrorHash["errorMessage"] = "Unable to manage your money at this time. Purchases may be unavailable";
- ErrorHash["errorURI"] = "";
-
- return ErrorHash;
- //throw (ex);
- }
- catch (SocketException ex)
- {
- m_log.ErrorFormat(
- "[MONEY]: Unable to connect to Money Server {0}. Exception {1}",
- m_MoneyAddress, ex);
-
- Hashtable ErrorHash = new Hashtable();
- ErrorHash["success"] = false;
- ErrorHash["errorMessage"] = "Unable to manage your money at this time. Purchases may be unavailable";
- ErrorHash["errorURI"] = "";
-
- return ErrorHash;
- //throw (ex);
- }
- catch (XmlException ex)
- {
- m_log.ErrorFormat(
- "[MONEY]: Unable to connect to Money Server {0}. Exception {1}",
- m_MoneyAddress, ex);
-
- Hashtable ErrorHash = new Hashtable();
- ErrorHash["success"] = false;
- ErrorHash["errorMessage"] = "Unable to manage your money at this time. Purchases may be unavailable";
- ErrorHash["errorURI"] = "";
-
- return ErrorHash;
- }
- if (MoneyResp.IsFault)
- {
- Hashtable ErrorHash = new Hashtable();
- ErrorHash["success"] = false;
- ErrorHash["errorMessage"] = "Unable to manage your money at this time. Purchases may be unavailable";
- ErrorHash["errorURI"] = "";
-
- return ErrorHash;
- }
- Hashtable MoneyRespData = (Hashtable) MoneyResp.Value;
-
- return MoneyRespData;
- }
-
- ///
- /// This informs the Money Grid Server that the avatar is in this simulator
- ///
- ///
- ///
- ///
- ///
- ///
- public Hashtable claim_user(UUID agentId, UUID secureSessionID, UUID regionId, string regionSecret)
- {
- Hashtable MoneyBalanceRequestParams = new Hashtable();
- MoneyBalanceRequestParams["agentId"] = agentId.ToString();
- MoneyBalanceRequestParams["secureSessionId"] = secureSessionID.ToString();
- MoneyBalanceRequestParams["regionId"] = regionId.ToString();
- MoneyBalanceRequestParams["secret"] = regionSecret;
-
- Hashtable MoneyRespData = genericCurrencyXMLRPCRequest(MoneyBalanceRequestParams, "simulatorClaimUserRequest");
- IClientAPI sendMoneyBal = LocateClientObject(agentId);
- if (sendMoneyBal != null)
- {
- SendMoneyBalance(sendMoneyBal, agentId, sendMoneyBal.SessionId, UUID.Zero);
- }
- return MoneyRespData;
- }
-
private SceneObjectPart findPrim(UUID objectID)
{
lock (m_scenel)
@@ -665,180 +421,6 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
}
}
- ///
- /// Informs the Money Grid Server of a transfer.
- ///
- ///
- ///
- ///
- ///
- public bool TransferMoneyonMoneyServer(UUID sourceId, UUID destId, int amount, int transactiontype, string description)
- {
- int aggregatePermInventory = 0;
- int aggregatePermNextOwner = 0;
- int flags = 0;
- bool rvalue = false;
-
- IClientAPI cli = LocateClientObject(sourceId);
- if (cli != null)
- {
- Scene userScene = null;
- lock (m_rootAgents)
- {
- userScene = GetSceneByUUID(m_rootAgents[sourceId]);
- }
- if (userScene != null)
- {
- Hashtable ht = new Hashtable();
- ht["agentId"] = sourceId.ToString();
- ht["secureSessionId"] = cli.SecureSessionId.ToString();
- ht["regionId"] = userScene.RegionInfo.originRegionID.ToString();
- ht["secret"] = userScene.RegionInfo.regionSecret;
- ht["currencySecret"] = " ";
- ht["destId"] = destId.ToString();
- ht["cash"] = amount;
- ht["aggregatePermInventory"] = aggregatePermInventory;
- ht["aggregatePermNextOwner"] = aggregatePermNextOwner;
- ht["flags"] = flags;
- ht["transactionType"] = transactiontype;
- ht["description"] = description;
-
- Hashtable hresult = genericCurrencyXMLRPCRequest(ht, "regionMoveMoney");
-
- if ((bool) hresult["success"] == true)
- {
- int funds1 = 0;
- int funds2 = 0;
- try
- {
- funds1 = (Int32) hresult["funds"];
- }
- catch (InvalidCastException)
- {
- funds1 = 0;
- }
- SetLocalFundsForAgentID(sourceId, funds1);
- if (m_KnownClientFunds.ContainsKey(destId))
- {
- try
- {
- funds2 = (Int32) hresult["funds2"];
- }
- catch (InvalidCastException)
- {
- funds2 = 0;
- }
- SetLocalFundsForAgentID(destId, funds2);
- }
-
-
- rvalue = true;
- }
- else
- {
- cli.SendAgentAlertMessage((string) hresult["errorMessage"], true);
- }
- }
- }
- else
- {
- m_log.ErrorFormat("[MONEY]: Client {0} not found", sourceId.ToString());
- }
-
- return rvalue;
- }
-
- public int GetRemoteBalance(UUID agentId)
- {
- int funds = 0;
-
- IClientAPI aClient = LocateClientObject(agentId);
- if (aClient != null)
- {
- Scene s = LocateSceneClientIn(agentId);
- if (s != null)
- {
- if (m_MoneyAddress.Length > 0)
- {
- Hashtable hbinfo =
- GetBalanceForUserFromMoneyServer(aClient.AgentId, aClient.SecureSessionId, s.RegionInfo.originRegionID,
- s.RegionInfo.regionSecret);
- if ((bool) hbinfo["success"] == true)
- {
- try
- {
- funds = (Int32) hbinfo["funds"];
- }
- catch (ArgumentException)
- {
- }
- catch (FormatException)
- {
- }
- catch (OverflowException)
- {
- m_log.ErrorFormat("[MONEY]: While getting the Currency for user {0}, the return funds overflowed.", agentId);
- aClient.SendAlertMessage("Unable to get your money balance, money operations will be unavailable");
- }
- catch (InvalidCastException)
- {
- funds = 0;
- }
- }
- else
- {
- m_log.WarnFormat("[MONEY]: Getting Money for user {0} failed with the following message:{1}", agentId,
- (string) hbinfo["errorMessage"]);
- aClient.SendAlertMessage((string) hbinfo["errorMessage"]);
- }
- }
-
- SetLocalFundsForAgentID(agentId, funds);
- SendMoneyBalance(aClient, agentId, aClient.SessionId, UUID.Zero);
- }
- else
- {
- m_log.Debug("[MONEY]: Got balance request update for agent that is here, but couldn't find which scene.");
- }
- }
- else
- {
- m_log.Debug("[MONEY]: Got balance request update for agent that isn't here.");
- }
- return funds;
- }
-
- public XmlRpcResponse GridMoneyUpdate(XmlRpcRequest request)
- {
- m_log.Debug("[MONEY]: Dynamic balance update called.");
- Hashtable requestData = (Hashtable) request.Params[0];
-
- if (requestData.ContainsKey("agentId"))
- {
- UUID agentId = UUID.Zero;
-
- UUID.TryParse((string) requestData["agentId"], out agentId);
- if (agentId != UUID.Zero)
- {
- GetRemoteBalance(agentId);
- }
- else
- {
- m_log.Debug("[MONEY]: invalid agentId specified, dropping.");
- }
- }
- else
- {
- m_log.Debug("[MONEY]: no agentId specified, dropping.");
- }
- XmlRpcResponse r = new XmlRpcResponse();
- Hashtable rparms = new Hashtable();
- rparms["success"] = true;
-
- r.Value = rparms;
- return r;
- }
-
///
/// XMLRPC handler to send alert message and sound to client
///
@@ -900,34 +482,20 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
Hashtable quoteResponse = new Hashtable();
XmlRpcResponse returnval = new XmlRpcResponse();
- if (requestData.ContainsKey("agentId") && requestData.ContainsKey("currencyBuy"))
- {
- UUID.TryParse((string) requestData["agentId"], out agentId);
- try
- {
- amount = (Int32) requestData["currencyBuy"];
- }
- catch (InvalidCastException)
- {
- }
- Hashtable currencyResponse = new Hashtable();
- currencyResponse.Add("estimatedCost", 0);
- currencyResponse.Add("currencyBuy", amount);
+
+ Hashtable currencyResponse = new Hashtable();
+ currencyResponse.Add("estimatedCost", 0);
+ currencyResponse.Add("currencyBuy", amount);
- quoteResponse.Add("success", true);
- quoteResponse.Add("currency", currencyResponse);
- quoteResponse.Add("confirm", "asdfad9fj39ma9fj");
+ quoteResponse.Add("success", true);
+ quoteResponse.Add("currency", currencyResponse);
+ quoteResponse.Add("confirm", "asdfad9fj39ma9fj");
- returnval.Value = quoteResponse;
- return returnval;
- }
-
-
- quoteResponse.Add("success", false);
- quoteResponse.Add("errorMessage", "Invalid parameters passed to the quote box");
- quoteResponse.Add("errorURI", "http://www.opensimulator.org/wiki");
returnval.Value = quoteResponse;
return returnval;
+
+
+
}
public XmlRpcResponse buy_func(XmlRpcRequest request)
@@ -935,36 +503,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
Hashtable requestData = (Hashtable) request.Params[0];
UUID agentId = UUID.Zero;
int amount = 0;
- if (requestData.ContainsKey("agentId") && requestData.ContainsKey("currencyBuy"))
- {
- UUID.TryParse((string) requestData["agentId"], out agentId);
- try
- {
- amount = (Int32) requestData["currencyBuy"];
- }
- catch (InvalidCastException)
- {
- }
- if (agentId != UUID.Zero)
- {
- lock (m_KnownClientFunds)
- {
- if (m_KnownClientFunds.ContainsKey(agentId))
- {
- m_KnownClientFunds[agentId] += amount;
- }
- else
- {
- m_KnownClientFunds.Add(agentId, amount);
- }
- }
- IClientAPI client = LocateClientObject(agentId);
- if (client != null)
- {
- SendMoneyBalance(client, agentId, client.SessionId, UUID.Zero);
- }
- }
- }
+
XmlRpcResponse returnval = new XmlRpcResponse();
Hashtable returnresp = new Hashtable();
returnresp.Add("success", true);
@@ -1015,36 +554,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
UUID agentId = UUID.Zero;
int amount = 0;
- if (requestData.ContainsKey("agentId") && requestData.ContainsKey("currencyBuy"))
- {
- UUID.TryParse((string) requestData["agentId"], out agentId);
- try
- {
- amount = (Int32) requestData["currencyBuy"];
- }
- catch (InvalidCastException)
- {
- }
- if (agentId != UUID.Zero)
- {
- lock (m_KnownClientFunds)
- {
- if (m_KnownClientFunds.ContainsKey(agentId))
- {
- m_KnownClientFunds[agentId] += amount;
- }
- else
- {
- m_KnownClientFunds.Add(agentId, amount);
- }
- }
- IClientAPI client = LocateClientObject(agentId);
- if (client != null)
- {
- SendMoneyBalance(client, agentId, client.SessionId, UUID.Zero);
- }
- }
- }
+
retparam.Add("success", true);
ret.Value = retparam;
@@ -1061,20 +571,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
///
private void CheckExistAndRefreshFunds(UUID agentID)
{
- lock (m_KnownClientFunds)
- {
- if (!m_KnownClientFunds.ContainsKey(agentID))
- {
- m_KnownClientFunds.Add(agentID, m_stipend);
- }
- else
- {
- if (m_KnownClientFunds[agentID] <= m_minFundsBeforeRefresh)
- {
- m_KnownClientFunds[agentID] = m_stipend;
- }
- }
- }
+
}
///
@@ -1085,33 +582,13 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
private int GetFundsForAgentID(UUID AgentID)
{
int returnfunds = 0;
- lock (m_KnownClientFunds)
- {
- if (m_KnownClientFunds.ContainsKey(AgentID))
- {
- returnfunds = m_KnownClientFunds[AgentID];
- }
- else
- {
- //throw new Exception("Unable to get funds.");
- }
- }
+
return returnfunds;
}
private void SetLocalFundsForAgentID(UUID AgentID, int amount)
{
- lock (m_KnownClientFunds)
- {
- if (m_KnownClientFunds.ContainsKey(AgentID))
- {
- m_KnownClientFunds[AgentID] = amount;
- }
- else
- {
- m_KnownClientFunds.Add(AgentID, amount);
- }
- }
+
}
#endregion
@@ -1227,16 +704,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
///
public void ClientClosed(UUID AgentID)
{
- lock (m_KnownClientFunds)
- {
- if (m_keepMoneyAcrossLogins && m_MoneyAddress.Length == 0)
- {
- }
- else
- {
- m_KnownClientFunds.Remove(AgentID);
- }
- }
+
}
///
@@ -1258,52 +726,19 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
private void ValidateLandBuy(Object osender, EventManager.LandBuyArgs e)
{
- if (m_MoneyAddress.Length == 0)
+
+
+ lock (e)
{
- lock (m_KnownClientFunds)
- {
- if (m_KnownClientFunds.ContainsKey(e.agentId))
- {
- // Does the sender have enough funds to give?
- if (m_KnownClientFunds[e.agentId] >= e.parcelPrice)
- {
- lock (e)
- {
- e.economyValidated = true;
- }
- }
- }
- }
- }
- else
- {
- if (GetRemoteBalance(e.agentId) >= e.parcelPrice)
- {
- lock (e)
- {
- e.economyValidated = true;
- }
- }
+ e.economyValidated = true;
}
+
+
}
private void processLandBuy(Object osender, EventManager.LandBuyArgs e)
{
- lock (e)
- {
- if (e.economyValidated == true && e.transactionID == 0)
- {
- e.transactionID = Util.UnixTimeSinceEpoch();
-
- if (doMoneyTransfer(e.agentId, e.parcelOwnerID, e.parcelPrice, 0, "Land purchase"))
- {
- lock (e)
- {
- e.amountDebited = e.parcelPrice;
- }
- }
- }
- }
+
}
///
@@ -1313,76 +748,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
///
private void MoneyTransferAction(Object osender, EventManager.MoneyTransferArgs e)
{
- IClientAPI sender = null;
- IClientAPI receiver = null;
-
- if (m_MoneyAddress.Length > 0) // Handled on server
- e.description = String.Empty;
-
- if (e.transactiontype == 5008) // Object gets paid
- {
- sender = LocateClientObject(e.sender);
- if (sender != null)
- {
- SceneObjectPart part = findPrim(e.receiver);
- if (part == null)
- return;
-
- string name = resolveAgentName(part.OwnerID);
- if (name == String.Empty)
- name = "(hippos)";
-
- receiver = LocateClientObject(part.OwnerID);
-
- string description = String.Format("Paid {0} via object {1}", name, e.description);
- bool transactionresult = doMoneyTransfer(e.sender, part.OwnerID, e.amount, e.transactiontype, description);
-
- if (transactionresult)
- {
- ObjectPaid handlerOnObjectPaid = OnObjectPaid;
- if (handlerOnObjectPaid != null)
- {
- handlerOnObjectPaid(e.receiver, e.sender, e.amount);
- }
- }
-
- if (e.sender != e.receiver)
- {
- sender.SendMoneyBalance(UUID.Random(), transactionresult, Utils.StringToBytes(e.description), GetFundsForAgentID(e.sender));
- }
- if (receiver != null)
- {
- receiver.SendMoneyBalance(UUID.Random(), transactionresult, Utils.StringToBytes(e.description), GetFundsForAgentID(part.OwnerID));
- }
- }
- return;
- }
-
- sender = LocateClientObject(e.sender);
- if (sender != null)
- {
- receiver = LocateClientObject(e.receiver);
-
- bool transactionresult = doMoneyTransfer(e.sender, e.receiver, e.amount, e.transactiontype, e.description);
-
- if (e.sender != e.receiver)
- {
- if (sender != null)
- {
- sender.SendMoneyBalance(UUID.Random(), transactionresult, Utils.StringToBytes(e.description), GetFundsForAgentID(e.sender));
- }
- }
-
- if (receiver != null)
- {
- receiver.SendMoneyBalance(UUID.Random(), transactionresult, Utils.StringToBytes(e.description), GetFundsForAgentID(e.receiver));
- }
- }
- else
- {
- m_log.Warn("[MONEY]: Potential Fraud Warning, got money transfer request for avatar that isn't in this simulator - Details; Sender:" +
- e.sender.ToString() + " Receiver: " + e.receiver.ToString() + " Amount: " + e.amount.ToString());
- }
+
}
///
@@ -1391,17 +757,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
///
private void MakeChildAgent(ScenePresence avatar)
{
- lock (m_rootAgents)
- {
- if (m_rootAgents.ContainsKey(avatar.UUID))
- {
- if (m_rootAgents[avatar.UUID] == avatar.Scene.RegionInfo.originRegionID)
- {
- m_rootAgents.Remove(avatar.UUID);
-// m_log.Debug("[MONEY]: Removing " + avatar.Firstname + " " + avatar.Lastname + " as a root agent");
- }
- }
- }
+
}
///
@@ -1410,14 +766,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
///
private void ClientLoggedOut(UUID AgentId)
{
- lock (m_rootAgents)
- {
- if (m_rootAgents.ContainsKey(AgentId))
- {
- m_rootAgents.Remove(AgentId);
- //m_log.Info("[MONEY]: Removing " + AgentId + ". Agent logged out.");
- }
- }
+
}
///
@@ -1437,104 +786,13 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
///
private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID)
{
- lock (m_rootAgents)
- {
- if (m_rootAgents.ContainsKey(avatar.UUID))
- {
- if (avatar.Scene.RegionInfo.originRegionID != m_rootAgents[avatar.UUID])
- {
- m_rootAgents[avatar.UUID] = avatar.Scene.RegionInfo.originRegionID;
-
-
- //m_log.Info("[MONEY]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + ".");
- // Claim User! my user! Mine mine mine!
- if (m_MoneyAddress.Length > 0)
- {
- Scene RegionItem = GetSceneByUUID(regionID);
- if (RegionItem != null)
- {
- Hashtable hresult =
- claim_user(avatar.UUID, avatar.ControllingClient.SecureSessionId, regionID, RegionItem.RegionInfo.regionSecret);
- if ((bool)hresult["success"] == true)
- {
- int funds = 0;
- try
- {
- funds = (Int32)hresult["funds"];
- }
- catch (InvalidCastException)
- {
- }
- SetLocalFundsForAgentID(avatar.UUID, funds);
- }
- else
- {
- avatar.ControllingClient.SendAgentAlertMessage((string)hresult["errorMessage"], true);
- }
- }
- }
- }
- else
- {
- ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
- if ((obj.landData.Flags & (uint)Parcel.ParcelFlags.AllowDamage) != 0)
- {
- avatar.Invulnerable = false;
- }
- else
- {
- avatar.Invulnerable = true;
- }
- }
- }
- else
- {
- lock (m_rootAgents)
- {
- m_rootAgents.Add(avatar.UUID, avatar.Scene.RegionInfo.originRegionID);
- }
- if (m_MoneyAddress.Length > 0)
- {
- Scene RegionItem = GetSceneByUUID(regionID);
- if (RegionItem != null)
- {
- Hashtable hresult = claim_user(avatar.UUID, avatar.ControllingClient.SecureSessionId, regionID, RegionItem.RegionInfo.regionSecret);
- if ((bool) hresult["success"] == true)
- {
- int funds = 0;
- try
- {
- funds = (Int32) hresult["funds"];
- }
- catch (InvalidCastException)
- {
- }
- SetLocalFundsForAgentID(avatar.UUID, funds);
- }
- else
- {
- avatar.ControllingClient.SendAgentAlertMessage((string) hresult["errorMessage"], true);
- }
- }
- }
-
- //m_log.Info("[MONEY]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + ".");
- }
- }
+
//m_log.Info("[FRIEND]: " + avatar.Name + " status:" + (!avatar.IsChildAgent).ToString());
}
public int GetBalance(IClientAPI client)
{
- GetClientFunds(client);
-
- lock (m_KnownClientFunds)
- {
- if (!m_KnownClientFunds.ContainsKey(client.AgentId))
- return 0;
-
- return m_KnownClientFunds[client.AgentId];
- }
+ return 0;
}
// Please do not refactor these to be just one method
@@ -1552,8 +810,6 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
public bool AmountCovered(IClientAPI client, int amount)
{
- if (GetBalance(client) < amount)
- return false;
return true;
}
@@ -1563,33 +819,7 @@ namespace OpenSim.Region.ReplaceableModules.MoneyModule
UUID sessionID, UUID groupID, UUID categoryID,
uint localID, byte saleType, int salePrice)
{
- GetClientFunds(remoteClient);
-
- if (!m_KnownClientFunds.ContainsKey(remoteClient.AgentId))
- {
- remoteClient.SendAgentAlertMessage("Unable to buy now. Your account balance was not found.", false);
- return;
- }
-
- int funds = m_KnownClientFunds[remoteClient.AgentId];
-
- if (salePrice != 0 && funds < salePrice)
- {
- remoteClient.SendAgentAlertMessage("Unable to buy now. You don't have sufficient funds.", false);
- return;
- }
-
- Scene s = LocateSceneClientIn(remoteClient.AgentId);
-
- SceneObjectPart part = s.GetSceneObjectPart(localID);
- if (part == null)
- {
- remoteClient.SendAgentAlertMessage("Unable to buy now. The object was not found.", false);
- return;
- }
-
- if (s.PerformObjectBuy(remoteClient, categoryID, localID, saleType))
- doMoneyTransfer(remoteClient.AgentId, part.OwnerID, salePrice, 5000, "Object buy");
+
}
}