Merge branch 'master' of /var/git/opensim/

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 b8aed0b..36aaab3 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 d644cdd..af26b2b 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;