aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2010-10-14 12:23:41 -0400
committerTeravus Ovares (Dan Olivares)2010-10-14 12:23:41 -0400
commitc148ef25a9fcb5236731e949f6c6dbf042d07ef9 (patch)
tree9022ef1ceac0478f93f0033e0dacbf630b4d9e09
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-c148ef25a9fcb5236731e949f6c6dbf042d07ef9.zip
opensim-SC_OLD-c148ef25a9fcb5236731e949f6c6dbf042d07ef9.tar.gz
opensim-SC_OLD-c148ef25a9fcb5236731e949f6c6dbf042d07ef9.tar.bz2
opensim-SC_OLD-c148ef25a9fcb5236731e949f6c6dbf042d07ef9.tar.xz
* Replacing Magic numbers with Enums
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs4
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
146 mesh = m_assetService.GetCached(meshID.ToString()); 146 mesh = m_assetService.GetCached(meshID.ToString());
147 if (mesh != null) 147 if (mesh != null)
148 { 148 {
149 if (mesh.Type == (sbyte)49) //TODO: Change to AssetType.Mesh when libomv gets updated! 149 if (mesh.Type == (SByte)AssetType.Mesh)
150 { 150 {
151 responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data); 151 responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
152 responsedata["content_type"] = "application/vnd.ll.mesh"; 152 responsedata["content_type"] = "application/vnd.ll.mesh";
@@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
167 mesh = m_assetService.Get(meshID.ToString()); 167 mesh = m_assetService.Get(meshID.ToString());
168 if (mesh != null) 168 if (mesh != null)
169 { 169 {
170 if (mesh.Type == (sbyte)49) //TODO: Change to AssetType.Mesh when libomv gets updated! 170 if (mesh.Type == (SByte)AssetType.Mesh)
171 { 171 {
172 responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data); 172 responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
173 responsedata["content_type"] = "application/vnd.ll.mesh"; 173 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 35f054f..0d26036 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
233 } 233 }
234 else if (inventoryType == "mesh") 234 else if (inventoryType == "mesh")
235 { 235 {
236 inType = 22; // TODO: Replace with appropriate type 236 inType = (sbyte)InventoryType.Mesh;
237 assType = 49;// TODO: Replace with appropriate type 237 assType = (sbyte)AssetType.Mesh;
238 } 238 }
239 239
240 AssetBase asset; 240 AssetBase asset;