diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs | 21 |
1 files changed, 2 insertions, 19 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Collections.Specialized; | ||
32 | using System.Drawing; | ||
33 | using System.Drawing.Imaging; | ||
34 | using System.Reflection; | 29 | using System.Reflection; |
35 | using System.IO; | ||
36 | using System.Web; | ||
37 | using log4net; | 30 | using log4net; |
38 | using Nini.Config; | ||
39 | using OpenMetaverse; | 31 | using OpenMetaverse; |
40 | using OpenMetaverse.StructuredData; | ||
41 | using OpenMetaverse.Imaging; | ||
42 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
43 | using OpenSim.Framework.Capabilities; | 33 | using OpenSim.Framework.Capabilities; |
44 | using OpenSim.Framework.Servers; | ||
45 | using OpenSim.Framework.Servers.HttpServer; | 34 | using OpenSim.Framework.Servers.HttpServer; |
46 | using OpenSim.Region.Framework.Interfaces; | ||
47 | using OpenSim.Services.Interfaces; | 35 | using OpenSim.Services.Interfaces; |
48 | using Caps = OpenSim.Framework.Capabilities.Caps; | 36 | using 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> |