aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs17
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs3
2 files changed, 17 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index b11210a..8db4e67 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -331,14 +331,22 @@ namespace OpenSim.Region.ClientStack.Linden
331 } 331 }
332 } 332 }
333 333
334 /// <summary>
335 /// Handle a request from the client for a Uri to upload a baked texture.
336 /// </summary>
337 /// <param name="request"></param>
338 /// <param name="path"></param>
339 /// <param name="param"></param>
340 /// <param name="httpRequest"></param>
341 /// <param name="httpResponse"></param>
342 /// <returns>The upload response if the request is successful, null otherwise.</returns>
334 public string UploadBakedTexture(string request, string path, 343 public string UploadBakedTexture(string request, string path,
335 string param, OSHttpRequest httpRequest, 344 string param, OSHttpRequest httpRequest,
336 OSHttpResponse httpResponse) 345 OSHttpResponse httpResponse)
337 { 346 {
338 try 347 try
339 { 348 {
340 // m_log.Debug("[CAPS]: UploadBakedTexture Request in region: " + 349// m_log.Debug("[CAPS]: UploadBakedTexture Request in region: " + m_regionName);
341 // m_regionName);
342 350
343 string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; 351 string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath;
344 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); 352 string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");
@@ -374,6 +382,11 @@ namespace OpenSim.Region.ClientStack.Linden
374 return null; 382 return null;
375 } 383 }
376 384
385 /// <summary>
386 /// Called when a baked texture has been successfully uploaded by a client.
387 /// </summary>
388 /// <param name="assetID"></param>
389 /// <param name="data"></param>
377 public void BakedTextureUploaded(UUID assetID, byte[] data) 390 public void BakedTextureUploaded(UUID assetID, byte[] data)
378 { 391 {
379 // m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString()); 392 // m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString());
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 1955e5b..75dbeb8 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -180,8 +180,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
180 } 180 }
181 181
182 /// <summary> 182 /// <summary>
183 /// Set appearance data (textureentry and slider settings) received from the client 183 /// Set appearance data (texture asset IDs and slider settings) received from the client
184 /// </summary> 184 /// </summary>
185 /// <param name="client"></param>
185 /// <param name="texture"></param> 186 /// <param name="texture"></param>
186 /// <param name="visualParam"></param> 187 /// <param name="visualParam"></param>
187 public void SetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams) 188 public void SetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams)