aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/UploadBakedTexture
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs21
-rw-r--r--OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs2
2 files changed, 3 insertions, 20 deletions
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
index 80b8306..f90c7e7 100644
--- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
@@ -26,24 +26,12 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Collections.Specialized;
32using System.Drawing;
33using System.Drawing.Imaging;
34using System.Reflection; 29using System.Reflection;
35using System.IO;
36using System.Web;
37using log4net; 30using log4net;
38using Nini.Config;
39using OpenMetaverse; 31using OpenMetaverse;
40using OpenMetaverse.StructuredData;
41using OpenMetaverse.Imaging;
42using OpenSim.Framework; 32using OpenSim.Framework;
43using OpenSim.Framework.Capabilities; 33using OpenSim.Framework.Capabilities;
44using OpenSim.Framework.Servers;
45using OpenSim.Framework.Servers.HttpServer; 34using OpenSim.Framework.Servers.HttpServer;
46using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Services.Interfaces; 35using OpenSim.Services.Interfaces;
48using Caps = OpenSim.Framework.Capabilities.Caps; 36using Caps = OpenSim.Framework.Capabilities.Caps;
49 37
@@ -56,13 +44,11 @@ namespace OpenSim.Capabilities.Handlers
56 44
57 private Caps m_HostCapsObj; 45 private Caps m_HostCapsObj;
58 private IAssetService m_assetService; 46 private IAssetService m_assetService;
59 private bool m_persistBakedTextures;
60 47
61 public UploadBakedTextureHandler(Caps caps, IAssetService assetService, bool persistBakedTextures) 48 public UploadBakedTextureHandler(Caps caps, IAssetService assetService)
62 { 49 {
63 m_HostCapsObj = caps; 50 m_HostCapsObj = caps;
64 m_assetService = assetService; 51 m_assetService = assetService;
65 m_persistBakedTextures = persistBakedTextures;
66 } 52 }
67 53
68 /// <summary> 54 /// <summary>
@@ -125,9 +111,8 @@ namespace OpenSim.Capabilities.Handlers
125 asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_HostCapsObj.AgentID.ToString()); 111 asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_HostCapsObj.AgentID.ToString());
126 asset.Data = data; 112 asset.Data = data;
127 asset.Temporary = true; 113 asset.Temporary = true;
128 asset.Local = !m_persistBakedTextures; // Local assets aren't persisted, non-local are 114 asset.Local = false;
129 m_assetService.Store(asset); 115 m_assetService.Store(asset);
130
131 } 116 }
132 } 117 }
133 118
@@ -151,8 +136,6 @@ namespace OpenSim.Capabilities.Handlers
151 // m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID); 136 // m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID);
152 } 137 }
153 138
154
155
156 /// <summary> 139 /// <summary>
157 /// Handle raw uploaded baked texture data. 140 /// Handle raw uploaded baked texture data.
158 /// </summary> 141 /// </summary>
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs
index 10ea8ee..fd484ba 100644
--- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Capabilities.Handlers
67 server.AddStreamHandler(new RestStreamHandler( 67 server.AddStreamHandler(new RestStreamHandler(
68 "POST", 68 "POST",
69 "/CAPS/UploadBakedTexture/", 69 "/CAPS/UploadBakedTexture/",
70 new UploadBakedTextureHandler(caps, m_AssetService, true).UploadBakedTexture, 70 new UploadBakedTextureHandler(caps, m_AssetService).UploadBakedTexture,
71 "UploadBakedTexture", 71 "UploadBakedTexture",
72 "Upload Baked Texture Capability")); 72 "Upload Baked Texture Capability"));
73 73