diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs')
-rw-r--r-- | OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs index 5536564..80b8306 100644 --- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Capabilities.Handlers | |||
51 | { | 51 | { |
52 | public class UploadBakedTextureHandler | 52 | public class UploadBakedTextureHandler |
53 | { | 53 | { |
54 | 54 | ||
55 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 55 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
56 | 56 | ||
57 | private Caps m_HostCapsObj; | 57 | private Caps m_HostCapsObj; |
@@ -81,7 +81,7 @@ namespace OpenSim.Capabilities.Handlers | |||
81 | { | 81 | { |
82 | string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; | 82 | string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; |
83 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); | 83 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); |
84 | 84 | ||
85 | BakedTextureUploader uploader = | 85 | BakedTextureUploader uploader = |
86 | new BakedTextureUploader(capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_HostCapsObj.AgentID); | 86 | new BakedTextureUploader(capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_HostCapsObj.AgentID); |
87 | uploader.OnUpLoad += BakedTextureUploaded; | 87 | uploader.OnUpLoad += BakedTextureUploaded; |
@@ -127,7 +127,7 @@ namespace OpenSim.Capabilities.Handlers | |||
127 | asset.Temporary = true; | 127 | asset.Temporary = true; |
128 | asset.Local = !m_persistBakedTextures; // Local assets aren't persisted, non-local are | 128 | asset.Local = !m_persistBakedTextures; // Local assets aren't persisted, non-local are |
129 | m_assetService.Store(asset); | 129 | m_assetService.Store(asset); |
130 | 130 | ||
131 | } | 131 | } |
132 | } | 132 | } |
133 | 133 | ||
@@ -151,7 +151,7 @@ namespace OpenSim.Capabilities.Handlers | |||
151 | // m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID); | 151 | // m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID); |
152 | } | 152 | } |
153 | 153 | ||
154 | 154 | ||
155 | 155 | ||
156 | /// <summary> | 156 | /// <summary> |
157 | /// Handle raw uploaded baked texture data. | 157 | /// Handle raw uploaded baked texture data. |