diff --git a/OpenSim/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Capabilities/LLSDAssetUploadRequest.cs
index 6e66f0acee..f981bf0fc1 100644
--- a/OpenSim/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Capabilities/LLSDAssetUploadRequest.cs
@@ -30,6 +30,15 @@ using OpenMetaverse;
namespace OpenSim.Framework.Capabilities
{
+ [OSDMap]
+ public class LLSDAssetResource
+ {
+ public OSDArray instance_list = new OSDArray();
+ public OSDArray texture_list = new OSDArray();
+ public OSDArray mesh_list = new OSDArray();
+ public string metric = String.Empty;
+ }
+
[OSDMap]
public class LLSDAssetUploadRequest
{
@@ -38,7 +47,7 @@ namespace OpenSim.Framework.Capabilities
public UUID folder_id = UUID.Zero;
public string inventory_type = String.Empty;
public string name = String.Empty;
-
+ public LLSDAssetResource asset_resources = new LLSDAssetResource();
public LLSDAssetUploadRequest()
{
}
diff --git a/OpenSim/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Capabilities/LLSDAssetUploadResponse.cs
index 0d6f7f9423..18285b581f 100644
--- a/OpenSim/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Capabilities/LLSDAssetUploadResponse.cs
@@ -29,12 +29,33 @@ using System;
namespace OpenSim.Framework.Capabilities
{
+ [OSDMap]
+ public class LLSDAssetUploadResponsePricebrkDown
+ {
+ public int mesh_streaming;
+ public int mesh_physics;
+ public int mesh_instance;
+ public int texture;
+ public int model;
+ }
+
+ [OSDMap]
+ public class LLSDAssetUploadResponseData
+ {
+ public double resource_cost;
+ public double model_streaming_cost;
+ public double simulation_cost;
+ public double physics_cost;
+ public LLSDAssetUploadResponsePricebrkDown upload_price_breakdown = new LLSDAssetUploadResponsePricebrkDown();
+ }
+
[OSDMap]
public class LLSDAssetUploadResponse
{
public string uploader = String.Empty;
public string state = String.Empty;
-
+ public int upload_price = 0;
+ public LLSDAssetUploadResponseData data = null;
public LLSDAssetUploadResponse()
{
}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 88c4d7f223..9982556853 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.ClientStack.Linden
public delegate void UpdateTaskScript(UUID itemID, UUID primID, bool isScriptRunning, byte[] data, ref ArrayList errors);
- public delegate void NewInventoryItem(UUID userID, InventoryItemBase item);
+ public delegate void NewInventoryItem(UUID userID, InventoryItemBase item, uint cost);
public delegate void NewAsset(AssetBase asset);
@@ -386,6 +386,37 @@ namespace OpenSim.Region.ClientStack.Linden
return UUID.Zero;
}
+ 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);
+ }
+ }
+
///
///
///
@@ -396,8 +427,11 @@ namespace OpenSim.Region.ClientStack.Linden
//m_log.Debug("[CAPS]: NewAgentInventoryRequest Request is: " + llsdRequest.ToString());
//m_log.Debug("asset upload request via CAPS" + llsdRequest.inventory_type + " , " + llsdRequest.asset_type);
+ uint cost = 0;
+
if (llsdRequest.asset_type == "texture" ||
llsdRequest.asset_type == "animation" ||
+ llsdRequest.asset_type == "mesh" ||
llsdRequest.asset_type == "sound")
{
ScenePresence avatar = null;
@@ -428,7 +462,31 @@ namespace OpenSim.Region.ClientStack.Linden
if (mm != null)
{
- if (!mm.UploadCovered(client.AgentId, mm.UploadCharge))
+ // XPTO: The cost should be calculated about here
+
+ if (llsdRequest.asset_type == "mesh")
+ {
+ if (llsdRequest.asset_resources == null)
+ {
+ client.SendAgentAlertMessage("Unable to upload asset. missing information.", false);
+
+ LLSDAssetUploadResponse errorResponse = new LLSDAssetUploadResponse();
+ errorResponse.uploader = "";
+ errorResponse.state = "error";
+ return errorResponse;
+ }
+
+ uint textures_cost = (uint)llsdRequest.asset_resources.texture_list.Array.Count;
+ textures_cost *= (uint)mm.UploadCharge;
+
+ cost = textures_cost;
+ }
+ else
+ {
+ cost = (uint)mm.UploadCharge;
+ }
+
+ if (!mm.UploadCovered(client.AgentId, (int)cost))
{
client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
@@ -449,9 +507,9 @@ namespace OpenSim.Region.ClientStack.Linden
UUID parentFolder = llsdRequest.folder_id;
string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
- AssetUploader uploader =
- new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,
- llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile);
+ AssetUploaderWithCost uploader =
+ new AssetUploaderWithCost(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,
+ llsdRequest.asset_type, capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_dumpAssetsToFile, cost);
m_HostCapsObj.HttpListener.AddStreamHandler(
new BinaryStreamHandler(
@@ -469,11 +527,31 @@ namespace OpenSim.Region.ClientStack.Linden
string uploaderURL = protocol + m_HostCapsObj.HostName + ":" + m_HostCapsObj.Port.ToString() + capsBase +
uploaderPath;
+
LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
uploadResponse.uploader = uploaderURL;
uploadResponse.state = "upload";
+ uploadResponse.upload_price = (int)cost;
+
+ // use fake values for now
+ if (llsdRequest.asset_type == "mesh")
+ {
+ uploadResponse.data = new LLSDAssetUploadResponseData();
+ uploadResponse.data.model_streaming_cost = 1.0;
+ uploadResponse.data.simulation_cost = 1.5;
+
+ uploadResponse.data.physics_cost = 2.0;
+ uploadResponse.data.resource_cost = 3.0;
+ uploadResponse.data.upload_price_breakdown.mesh_instance = 1;
+ uploadResponse.data.upload_price_breakdown.mesh_physics = 2;
+ uploadResponse.data.upload_price_breakdown.mesh_streaming = 3;
+ uploadResponse.data.upload_price_breakdown.texture = 5;
+ uploadResponse.data.upload_price_breakdown.model = 4;
+ }
+
uploader.OnUpLoad += UploadCompleteHandler;
return uploadResponse;
+
}
///
@@ -484,7 +562,7 @@ namespace OpenSim.Region.ClientStack.Linden
///
public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID,
UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType,
- string assetType)
+ string assetType, uint cost)
{
m_log.DebugFormat(
"[BUNCH OF CAPS]: Uploaded asset {0} for inventory item {1}, inv type {2}, asset type {3}",
@@ -703,7 +781,7 @@ namespace OpenSim.Region.ClientStack.Linden
if (AddNewInventoryItem != null)
{
- AddNewInventoryItem(m_HostCapsObj.AgentID, item);
+ AddNewInventoryItem(m_HostCapsObj.AgentID, item, cost);
}
}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
deleted file mode 100644
index 52c4f44c8c..0000000000
--- a/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Reflection;
-using System.IO;
-using System.Web;
-using Mono.Addins;
-using log4net;
-using Nini.Config;
-using OpenMetaverse;
-using OpenMetaverse.StructuredData;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Services.Interfaces;
-using Caps = OpenSim.Framework.Capabilities.Caps;
-using OpenSim.Framework.Capabilities;
-
-namespace OpenSim.Region.ClientStack.Linden
-{
- [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
- public class NewFileAgentInventoryVariablePriceModule : INonSharedRegionModule
- {
-// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- private Scene m_scene;
-// private IAssetService m_assetService;
- private bool m_dumpAssetsToFile = false;
- private bool m_enabled = true;
- private int m_levelUpload = 0;
-
- #region IRegionModuleBase Members
-
-
- public Type ReplaceableInterface
- {
- get { return null; }
- }
-
- public void Initialise(IConfigSource source)
- {
- IConfig meshConfig = source.Configs["Mesh"];
- if (meshConfig == null)
- return;
-
- m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true);
- m_levelUpload = meshConfig.GetInt("LevelUpload", 0);
- }
-
- public void AddRegion(Scene pScene)
- {
- m_scene = pScene;
- }
-
- public void RemoveRegion(Scene scene)
- {
-
- m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
- m_scene = null;
- }
-
- public void RegionLoaded(Scene scene)
- {
-
-// m_assetService = m_scene.RequestModuleInterface();
- m_scene.EventManager.OnRegisterCaps += RegisterCaps;
- }
-
- #endregion
-
-
- #region IRegionModule Members
-
-
-
- public void Close() { }
-
- public string Name { get { return "NewFileAgentInventoryVariablePriceModule"; } }
-
-
- public void RegisterCaps(UUID agentID, Caps caps)
- {
- if(!m_enabled)
- return;
-
- UUID capID = UUID.Random();
-
-// m_log.Debug("[NEW FILE AGENT INVENTORY VARIABLE PRICE]: /CAPS/" + capID);
- caps.RegisterHandler(
- "NewFileAgentInventoryVariablePrice",
- new LLSDStreamhandler(
- "POST",
- "/CAPS/" + capID.ToString(),
- req => NewAgentInventoryRequest(req, agentID),
- "NewFileAgentInventoryVariablePrice",
- agentID.ToString()));
- }
-
- #endregion
-
- 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
- // you need to be aware of this
-
- //if (llsdRequest.asset_type == "texture" ||
- // llsdRequest.asset_type == "animation" ||
- // llsdRequest.asset_type == "sound")
- // {
- // check user level
-
- ScenePresence avatar = null;
- IClientAPI client = null;
- m_scene.TryGetScenePresence(agentID, out avatar);
-
- if (avatar != null)
- {
- client = avatar.ControllingClient;
-
- if (avatar.UserLevel < m_levelUpload)
- {
- if (client != null)
- client.SendAgentAlertMessage("Unable to upload asset. Insufficient permissions.", false);
-
- LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
- errorResponse.rsvp = "";
- errorResponse.state = "error";
- return errorResponse;
- }
- }
-
- // check funds
- IMoneyModule mm = m_scene.RequestModuleInterface();
-
- if (mm != null)
- {
- if (!mm.UploadCovered(agentID, mm.UploadCharge))
- {
- if (client != null)
- client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
-
- LLSDNewFileAngentInventoryVariablePriceReplyResponse errorResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
- errorResponse.rsvp = "";
- errorResponse.state = "error";
- return errorResponse;
- }
- }
-
- // }
-
- string assetName = llsdRequest.name;
- string assetDes = llsdRequest.description;
- string capsBase = "/CAPS/NewFileAgentInventoryVariablePrice/";
- UUID newAsset = UUID.Random();
- UUID newInvItem = UUID.Random();
- UUID parentFolder = llsdRequest.folder_id;
- string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000") + "/";
-
- AssetUploader uploader =
- new AssetUploader(assetName, assetDes, newAsset, newInvItem, parentFolder, llsdRequest.inventory_type,
- llsdRequest.asset_type, capsBase + uploaderPath, MainServer.Instance, m_dumpAssetsToFile);
-
- MainServer.Instance.AddStreamHandler(
- new BinaryStreamHandler(
- "POST",
- capsBase + uploaderPath,
- uploader.uploaderCaps,
- "NewFileAgentInventoryVariablePrice",
- agentID.ToString()));
-
- string protocol = "http://";
-
- if (MainServer.Instance.UseSSL)
- protocol = "https://";
-
- string uploaderURL = protocol + m_scene.RegionInfo.ExternalHostName + ":" + MainServer.Instance.Port.ToString() + capsBase +
- uploaderPath;
-
-
- LLSDNewFileAngentInventoryVariablePriceReplyResponse uploadResponse = new LLSDNewFileAngentInventoryVariablePriceReplyResponse();
-
- uploadResponse.rsvp = uploaderURL;
- uploadResponse.state = "upload";
- uploadResponse.resource_cost = 0;
- uploadResponse.upload_price = 0;
-
- uploader.OnUpLoad += //UploadCompleteHandler;
-
- delegate(
- string passetName, string passetDescription, UUID passetID,
- UUID pinventoryItem, UUID pparentFolder, byte[] pdata, string pinventoryType,
- string passetType)
- {
- UploadCompleteHandler(passetName, passetDescription, passetID,
- pinventoryItem, pparentFolder, pdata, pinventoryType,
- passetType,agentID);
- };
-
- return uploadResponse;
- }
-
- public void UploadCompleteHandler(string assetName, string assetDescription, UUID assetID,
- UUID inventoryItem, UUID parentFolder, byte[] data, string inventoryType,
- string assetType,UUID AgentID)
- {
-// m_log.DebugFormat(
-// "[NEW FILE AGENT INVENTORY VARIABLE PRICE MODULE]: Upload complete for {0}", inventoryItem);
-
- sbyte assType = 0;
- sbyte inType = 0;
-
- if (inventoryType == "sound")
- {
- inType = 1;
- assType = 1;
- }
- else if (inventoryType == "animation")
- {
- inType = 19;
- assType = 20;
- }
- else if (inventoryType == "wearable")
- {
- inType = 18;
- switch (assetType)
- {
- case "bodypart":
- assType = 13;
- break;
- case "clothing":
- assType = 5;
- break;
- }
- }
- else if (inventoryType == "mesh")
- {
- inType = (sbyte)InventoryType.Mesh;
- assType = (sbyte)AssetType.Mesh;
- }
-
- AssetBase asset;
- asset = new AssetBase(assetID, assetName, assType, AgentID.ToString());
- asset.Data = data;
-
- if (m_scene.AssetService != null)
- m_scene.AssetService.Store(asset);
-
- InventoryItemBase item = new InventoryItemBase();
- item.Owner = AgentID;
- item.CreatorId = AgentID.ToString();
- item.ID = inventoryItem;
- item.AssetID = asset.FullID;
- item.Description = assetDescription;
- item.Name = assetName;
- item.AssetType = assType;
- item.InvType = inType;
- item.Folder = parentFolder;
- item.CurrentPermissions
- = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer);
- item.BasePermissions = (uint)PermissionMask.All;
- item.EveryOnePermissions = 0;
- item.NextPermissions = (uint)PermissionMask.All;
- item.CreationDate = Util.UnixTimeSinceEpoch();
- m_scene.AddInventoryItem(item);
- }
- }
-}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 1309623d2b..2d9a03568c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -101,12 +101,12 @@ namespace OpenSim.Region.Framework.Scenes
engine.StartProcessing();
}
- public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item)
+ public void AddUploadedInventoryItem(UUID agentID, InventoryItemBase item, uint cost)
{
IMoneyModule money = RequestModuleInterface();
if (money != null)
{
- money.ApplyUploadCharge(agentID, money.UploadCharge, "Asset upload");
+ money.ApplyUploadCharge(agentID, (int)cost, "Asset upload");
}
AddInventoryItem(item);