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

Add cost calculation suppor tto the VariablePrice one as well

avinationmerge
Melanie 2012-09-11 17:50:55 +02:00
parent ead4b8998c
commit a6928a479e
2 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@ -417,7 +417,6 @@ namespace OpenSim.Region.ClientStack.Linden
} }
} }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>

52
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
View File

@ -127,6 +127,37 @@ namespace OpenSim.Region.ClientStack.Linden
#endregion #endregion
private delegate void UploadWithCostCompleteDelegate(string assetName,
string assetDescription, UUID assetID, UUID inventoryItem,
UUID parentFolder, byte[] data, string inventoryType,
string assetType, uint cost);
private class AssetUploaderWithCost : AssetUploader
{
private uint m_cost;
public event UploadWithCostCompleteDelegate OnUpLoad;
public AssetUploaderWithCost(string assetName, string description, UUID assetID,
UUID inventoryItem, UUID parentFolderID, string invType, string assetType,
string path, IHttpServer httpServer, bool dumpAssetsToFile, uint cost) :
base(assetName, description, assetID, inventoryItem, parentFolderID,
invType, assetType, path, httpServer, dumpAssetsToFile)
{
m_cost = cost;
base.OnUpLoad += UploadCompleteHandler;
}
private void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID,
UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType,
string assetType)
{
OnUpLoad(assetName, assetDescription, assetID, inventoryItem, parentFolder,
data, inventoryType, assetType, m_cost);
}
}
public LLSDNewFileAngentInventoryVariablePriceReplyResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest, UUID agentID) public LLSDNewFileAngentInventoryVariablePriceReplyResponse NewAgentInventoryRequest(LLSDAssetUploadRequest llsdRequest, UUID agentID)
{ {
//TODO: The Mesh uploader uploads many types of content. If you're going to implement a Money based limit //TODO: The Mesh uploader uploads many types of content. If you're going to implement a Money based limit
@ -138,6 +169,8 @@ namespace OpenSim.Region.ClientStack.Linden
// { // {
// check user level // check user level
uint cost = 0;
ScenePresence avatar = null; ScenePresence avatar = null;
IClientAPI client = null; IClientAPI client = null;
m_scene.TryGetScenePresence(agentID, out avatar); m_scene.TryGetScenePresence(agentID, out avatar);
@ -163,7 +196,10 @@ namespace OpenSim.Region.ClientStack.Linden
if (mm != null) if (mm != null)
{ {
if (!mm.UploadCovered(agentID, mm.UploadCharge)) // XPTO: Calculate cost here
cost = (uint)mm.UploadCharge;
if (!mm.UploadCovered(agentID, (int)cost))
{ {
if (client != null) if (client != null)
client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
@ -185,9 +221,9 @@ namespace OpenSim.Region.ClientStack.Linden
UUID parentFolder = llsdRequest.folder_id; UUID parentFolder = llsdRequest.folder_id;
string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000") + "/"; string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000") + "/";
AssetUploader uploader = AssetUploaderWithCost uploader =
new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type, new AssetUploaderWithCost(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,
llsdRequest.asset_type, capsBase + uploaderPath, MainServer.Instance, m_dumpAssetsToFile); llsdRequest.asset_type, capsBase + uploaderPath, MainServer.Instance, m_dumpAssetsToFile, cost);
MainServer.Instance.AddStreamHandler( MainServer.Instance.AddStreamHandler(
new BinaryStreamHandler( new BinaryStreamHandler(
@ -218,11 +254,11 @@ namespace OpenSim.Region.ClientStack.Linden
delegate( delegate(
string passetName, string passetDescription, UUID passetID, string passetName, string passetDescription, UUID passetID,
UUID pinventoryItem, UUID pparentFolder, byte[] pdata, string pinventoryType, UUID pinventoryItem, UUID pparentFolder, byte[] pdata, string pinventoryType,
string passetType) string passetType, uint cost)
{ {
UploadCompleteHandler(passetName, passetDescription, passetID, UploadCompleteHandler(passetName, passetDescription, passetID,
pinventoryItem, pparentFolder, pdata, pinventoryType, pinventoryItem, pparentFolder, pdata, pinventoryType,
passetType,agentID); passetType,agentID, cost);
}; };
return uploadResponse; return uploadResponse;
@ -230,7 +266,7 @@ namespace OpenSim.Region.ClientStack.Linden
public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID, public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID,
UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType, UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType,
string assetType,UUID AgentID) string assetType,UUID AgentID, uint cost)
{ {
// m_log.DebugFormat( // m_log.DebugFormat(
// "[NEW FILE AGENT INVENTORY VARIABLE PRICE MODULE]: Upload complete for {0}", inventoryItem); // "[NEW FILE AGENT INVENTORY VARIABLE PRICE MODULE]: Upload complete for {0}", inventoryItem);
@ -290,7 +326,7 @@ namespace OpenSim.Region.ClientStack.Linden
item.EveryOnePermissions = 0; item.EveryOnePermissions = 0;
item.NextPermissions = (uint)PermissionMask.All; item.NextPermissions = (uint)PermissionMask.All;
item.CreationDate = Util.UnixTimeSinceEpoch(); item.CreationDate = Util.UnixTimeSinceEpoch();
m_scene.AddInventoryItem(item); m_scene.AddUploadedInventoryItem(AgentID, item, cost);
} }
} }
} }