From c148ef25a9fcb5236731e949f6c6dbf042d07ef9 Mon Sep 17 00:00:00 2001 From: "Teravus Ovares (Dan Olivares)" Date: Thu, 14 Oct 2010 12:23:41 -0400 Subject: [PATCH] * Replacing Magic numbers with Enums --- OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs | 4 ++-- .../Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs index b8aed0be3a..36aaab31dc 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs @@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets mesh = m_assetService.GetCached(meshID.ToString()); if (mesh != null) { - if (mesh.Type == (sbyte)49) //TODO: Change to AssetType.Mesh when libomv gets updated! + if (mesh.Type == (SByte)AssetType.Mesh) { responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data); responsedata["content_type"] = "application/vnd.ll.mesh"; @@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets mesh = m_assetService.Get(meshID.ToString()); if (mesh != null) { - if (mesh.Type == (sbyte)49) //TODO: Change to AssetType.Mesh when libomv gets updated! + if (mesh.Type == (SByte)AssetType.Mesh) { responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data); responsedata["content_type"] = "application/vnd.ll.mesh"; diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs index 35f054fa21..0d26036b26 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs @@ -233,8 +233,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets } else if (inventoryType == "mesh") { - inType = 22; // TODO: Replace with appropriate type - assType = 49;// TODO: Replace with appropriate type + inType = (sbyte)InventoryType.Mesh; + assType = (sbyte)AssetType.Mesh; } AssetBase asset;