diff options
author | Teravus Ovares (Dan Olivares) | 2010-10-14 09:24:15 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2010-10-14 09:24:15 -0400 |
commit | 7e363b79c7894b8c393ec38ae60ea19f8cb65d5e (patch) | |
tree | abd4fc965bc45736f364667d6376f16eef67a60c /OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
download | opensim-SC_OLD-7e363b79c7894b8c393ec38ae60ea19f8cb65d5e.zip opensim-SC_OLD-7e363b79c7894b8c393ec38ae60ea19f8cb65d5e.tar.gz opensim-SC_OLD-7e363b79c7894b8c393ec38ae60ea19f8cb65d5e.tar.bz2 opensim-SC_OLD-7e363b79c7894b8c393ec38ae60ea19f8cb65d5e.tar.xz |
* Tweaked the upload response and now at least uploading the mesh works.
* Binary error on downloading the mesh though.. so still not yet working.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs index c1e9891..bae108c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs | |||
@@ -145,7 +145,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets | |||
145 | mesh = m_assetService.GetCached(meshID.ToString()); | 145 | mesh = m_assetService.GetCached(meshID.ToString()); |
146 | if (mesh != null) | 146 | if (mesh != null) |
147 | { | 147 | { |
148 | if (mesh.Type == (sbyte)45) //TODO: Change to AssetType.Mesh when libomv gets updated! | 148 | if (mesh.Type == (sbyte)49) //TODO: Change to AssetType.Mesh when libomv gets updated! |
149 | { | 149 | { |
150 | responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data); | 150 | responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data); |
151 | responsedata["content_type"] = "application/vnd.ll.mesh"; | 151 | responsedata["content_type"] = "application/vnd.ll.mesh"; |
@@ -166,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets | |||
166 | mesh = m_assetService.Get(meshID.ToString()); | 166 | mesh = m_assetService.Get(meshID.ToString()); |
167 | if (mesh != null) | 167 | if (mesh != null) |
168 | { | 168 | { |
169 | if (mesh.Type == (sbyte)45) //TODO: Change to AssetType.Mesh when libomv gets updated! | 169 | if (mesh.Type == (sbyte)49) //TODO: Change to AssetType.Mesh when libomv gets updated! |
170 | { | 170 | { |
171 | responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data); | 171 | responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data); |
172 | responsedata["content_type"] = "application/vnd.ll.mesh"; | 172 | responsedata["content_type"] = "application/vnd.ll.mesh"; |