OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

viewer-2-initial-appearance
opensim mirror account 2010-10-14 09:30:05 -07:00
parent 8f16d65896 486eede9be
commit cb2c1d794c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
View File

@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
mesh = m_assetService.GetCached(meshID.ToString()); mesh = m_assetService.GetCached(meshID.ToString());
if (mesh != null) 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["str_response_string"] = Convert.ToBase64String(mesh.Data);
responsedata["content_type"] = "application/vnd.ll.mesh"; responsedata["content_type"] = "application/vnd.ll.mesh";
@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
mesh = m_assetService.Get(meshID.ToString()); mesh = m_assetService.Get(meshID.ToString());
if (mesh != null) 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["str_response_string"] = Convert.ToBase64String(mesh.Data);
responsedata["content_type"] = "application/vnd.ll.mesh"; responsedata["content_type"] = "application/vnd.ll.mesh";

4
OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs
View File

@ -233,8 +233,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
} }
else if (inventoryType == "mesh") else if (inventoryType == "mesh")
{ {
inType = 22; // TODO: Replace with appropriate type inType = (sbyte)InventoryType.Mesh;
assType = 49;// TODO: Replace with appropriate type assType = (sbyte)AssetType.Mesh;
} }
AssetBase asset; AssetBase asset;