remove dead code
UbitUmarov
parent
5da135a90b
commit
c289b83250
|
|
@ -1,164 +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.Reflection;
|
|
||||||
using log4net;
|
|
||||||
using OpenMetaverse;
|
|
||||||
using OpenSim.Framework;
|
|
||||||
using OpenSim.Framework.Capabilities;
|
|
||||||
using OpenSim.Framework.Servers.HttpServer;
|
|
||||||
using OpenSim.Services.Interfaces;
|
|
||||||
using Caps = OpenSim.Framework.Capabilities.Caps;
|
|
||||||
|
|
||||||
namespace OpenSim.Capabilities.Handlers
|
|
||||||
{
|
|
||||||
public class UploadBakedTextureHandler
|
|
||||||
{
|
|
||||||
|
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
|
||||||
|
|
||||||
private Caps m_HostCapsObj;
|
|
||||||
private IAssetService m_assetService;
|
|
||||||
|
|
||||||
public UploadBakedTextureHandler(Caps caps, IAssetService assetService)
|
|
||||||
{
|
|
||||||
m_HostCapsObj = caps;
|
|
||||||
m_assetService = assetService;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Handle a request from the client for a Uri to upload a baked texture.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="request"></param>
|
|
||||||
/// <param name="path"></param>
|
|
||||||
/// <param name="param"></param>
|
|
||||||
/// <param name="httpRequest"></param>
|
|
||||||
/// <param name="httpResponse"></param>
|
|
||||||
/// <returns>The upload response if the request is successful, null otherwise.</returns>
|
|
||||||
public string UploadBakedTexture(
|
|
||||||
string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000");
|
|
||||||
|
|
||||||
BakedTextureUploader uploader =
|
|
||||||
new BakedTextureUploader(capsBase, m_HostCapsObj.HttpListener, m_HostCapsObj.AgentID);
|
|
||||||
uploader.OnUpLoad += BakedTextureUploaded;
|
|
||||||
|
|
||||||
m_HostCapsObj.HttpListener.AddStreamHandler(
|
|
||||||
new BinaryStreamHandler("POST", capsBase, uploader.uploaderCaps, "UploadBakedTexture", null));
|
|
||||||
|
|
||||||
string protocol = m_HostCapsObj.SSLCaps ? "https://" : "http://";
|
|
||||||
|
|
||||||
string uploaderURL = protocol + m_HostCapsObj.HostName + ":" +
|
|
||||||
m_HostCapsObj.Port.ToString() + capsBase;
|
|
||||||
|
|
||||||
LLSDAssetUploadResponse uploadResponse = new LLSDAssetUploadResponse();
|
|
||||||
uploadResponse.uploader = uploaderURL;
|
|
||||||
uploadResponse.state = "upload";
|
|
||||||
|
|
||||||
return LLSDHelpers.SerialiseLLSDReply(uploadResponse);
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
m_log.ErrorFormat("[UPLOAD BAKED TEXTURE HANDLER]: {0}{1}", e.Message, e.StackTrace);
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Called when a baked texture has been successfully uploaded by a client.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="assetID"></param>
|
|
||||||
/// <param name="data"></param>
|
|
||||||
private void BakedTextureUploaded(UUID assetID, byte[] data)
|
|
||||||
{
|
|
||||||
m_log.DebugFormat("[UPLOAD BAKED TEXTURE HANDLER]: Received baked texture {0}", assetID.ToString());
|
|
||||||
|
|
||||||
AssetBase asset;
|
|
||||||
asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_HostCapsObj.AgentID.ToString());
|
|
||||||
asset.Data = data;
|
|
||||||
asset.Temporary = true;
|
|
||||||
asset.Local = true;
|
|
||||||
//asset.Flags = AssetFlags.AvatarBake;
|
|
||||||
m_assetService.Store(asset);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class BakedTextureUploader
|
|
||||||
{
|
|
||||||
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
|
||||||
|
|
||||||
public event Action<UUID, byte[]> OnUpLoad;
|
|
||||||
|
|
||||||
private string uploaderPath = String.Empty;
|
|
||||||
private UUID newAssetID;
|
|
||||||
private IHttpServer httpListener;
|
|
||||||
private UUID AgentId = UUID.Zero;
|
|
||||||
|
|
||||||
public BakedTextureUploader(string path, IHttpServer httpServer, UUID uUID)
|
|
||||||
{
|
|
||||||
newAssetID = UUID.Random();
|
|
||||||
uploaderPath = path;
|
|
||||||
httpListener = httpServer;
|
|
||||||
AgentId = uUID;
|
|
||||||
// m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Handle raw uploaded baked texture data.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="data"></param>
|
|
||||||
/// <param name="path"></param>
|
|
||||||
/// <param name="param"></param>
|
|
||||||
/// <returns></returns>
|
|
||||||
public string uploaderCaps(byte[] data, string path, string param)
|
|
||||||
{
|
|
||||||
// Don't do this asynchronously, otherwise it's possible for the client to send set appearance information
|
|
||||||
// on another thread which might send out avatar updates before the asset has been put into the asset
|
|
||||||
// service.
|
|
||||||
OnUpLoad?.Invoke(newAssetID, data);
|
|
||||||
|
|
||||||
string res = String.Empty;
|
|
||||||
LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
|
|
||||||
uploadComplete.new_asset = newAssetID.ToString();
|
|
||||||
uploadComplete.new_inventory_item = UUID.Zero;
|
|
||||||
uploadComplete.state = "complete";
|
|
||||||
|
|
||||||
res = LLSDHelpers.SerialiseLLSDReply(uploadComplete);
|
|
||||||
|
|
||||||
httpListener.RemoveStreamHandler("POST", uploaderPath);
|
|
||||||
|
|
||||||
// m_log.DebugFormat("[BAKED TEXTURE UPLOADER]: baked texture upload completed for {0}", newAssetID);
|
|
||||||
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,76 +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 Nini.Config;
|
|
||||||
using OpenSim.Server.Base;
|
|
||||||
using OpenSim.Services.Interfaces;
|
|
||||||
using OpenSim.Framework.Servers.HttpServer;
|
|
||||||
using OpenSim.Server.Handlers.Base;
|
|
||||||
using OpenMetaverse;
|
|
||||||
|
|
||||||
namespace OpenSim.Capabilities.Handlers
|
|
||||||
{
|
|
||||||
public class UploadBakedTextureServerConnector : ServiceConnector
|
|
||||||
{
|
|
||||||
private IAssetService m_AssetService;
|
|
||||||
private string m_ConfigName = "CapsService";
|
|
||||||
|
|
||||||
public UploadBakedTextureServerConnector(IConfigSource config, IHttpServer server, string configName) :
|
|
||||||
base(config, server, configName)
|
|
||||||
{
|
|
||||||
if (configName != String.Empty)
|
|
||||||
m_ConfigName = configName;
|
|
||||||
|
|
||||||
IConfig serverConfig = config.Configs[m_ConfigName];
|
|
||||||
if (serverConfig == null)
|
|
||||||
throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
|
|
||||||
|
|
||||||
string assetService = serverConfig.GetString("AssetService", String.Empty);
|
|
||||||
|
|
||||||
if (assetService == String.Empty)
|
|
||||||
throw new Exception("No AssetService in config file");
|
|
||||||
|
|
||||||
Object[] args = new Object[] { config };
|
|
||||||
m_AssetService =
|
|
||||||
ServerUtils.LoadPlugin<IAssetService>(assetService, args);
|
|
||||||
|
|
||||||
if (m_AssetService == null)
|
|
||||||
throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
|
|
||||||
|
|
||||||
// NEED TO FIX THIS
|
|
||||||
OpenSim.Framework.Capabilities.Caps caps = new OpenSim.Framework.Capabilities.Caps(server, "", server.Port, "", UUID.Zero, "");
|
|
||||||
server.AddStreamHandler(new RestStreamHandler(
|
|
||||||
"POST",
|
|
||||||
"/CAPS/UploadBakedTexture/",
|
|
||||||
new UploadBakedTextureHandler(caps, m_AssetService).UploadBakedTexture,
|
|
||||||
"UploadBakedTexture",
|
|
||||||
"Upload Baked Texture Capability"));
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue