aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorteravus2012-11-15 09:44:02 -0500
committerteravus2012-11-15 09:44:02 -0500
commit619c39e5144f15aca129d6d999bcc5c34133ee64 (patch)
treed8acd7e926cf8bff53d62bc1acda34018e17f3f7
parent* Prep work switching the GetMeshModule over to a poll service. (diff)
downloadopensim-SC-619c39e5144f15aca129d6d999bcc5c34133ee64.zip
opensim-SC-619c39e5144f15aca129d6d999bcc5c34133ee64.tar.gz
opensim-SC-619c39e5144f15aca129d6d999bcc5c34133ee64.tar.bz2
opensim-SC-619c39e5144f15aca129d6d999bcc5c34133ee64.tar.xz
* Fixes mesh loading issues in last commit.
-rw-r--r--OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
index d29bed9..da59294 100644
--- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
@@ -99,6 +99,7 @@ namespace OpenSim.Capabilities.Handlers
99 responsedata["content_type"] = "text/plain"; 99 responsedata["content_type"] = "text/plain";
100 responsedata["keepalive"] = false; 100 responsedata["keepalive"] = false;
101 responsedata["str_response_string"] = "Request wasn't what was expected"; 101 responsedata["str_response_string"] = "Request wasn't what was expected";
102 responsedata["reusecontext"] = false;
102 103
103 string meshStr = string.Empty; 104 string meshStr = string.Empty;
104 105
@@ -114,6 +115,7 @@ namespace OpenSim.Capabilities.Handlers
114 responsedata["content_type"] = "text/plain"; 115 responsedata["content_type"] = "text/plain";
115 responsedata["keepalive"] = false; 116 responsedata["keepalive"] = false;
116 responsedata["str_response_string"] = "The asset service is unavailable. So is your mesh."; 117 responsedata["str_response_string"] = "The asset service is unavailable. So is your mesh.";
118 responsedata["reusecontext"] = false;
117 return responsedata; 119 return responsedata;
118 } 120 }
119 121
@@ -149,6 +151,7 @@ namespace OpenSim.Capabilities.Handlers
149 responsedata["content_type"] = "text/plain"; 151 responsedata["content_type"] = "text/plain";
150 responsedata["keepalive"] = false; 152 responsedata["keepalive"] = false;
151 responsedata["str_response_string"] = "This range doesnt exist."; 153 responsedata["str_response_string"] = "This range doesnt exist.";
154 responsedata["reusecontext"] = false;
152 return responsedata; 155 return responsedata;
153 } 156 }
154 else 157 else
@@ -166,6 +169,7 @@ namespace OpenSim.Capabilities.Handlers
166 responsedata["int_response_code"] = (int) System.Net.HttpStatusCode.OK; 169 responsedata["int_response_code"] = (int) System.Net.HttpStatusCode.OK;
167 responsedata["bin_response_data"] = mesh.Data; 170 responsedata["bin_response_data"] = mesh.Data;
168 responsedata["int_bytes"] = mesh.Data.Length; 171 responsedata["int_bytes"] = mesh.Data.Length;
172 responsedata["reusecontext"] = false;
169 } 173 }
170 else 174 else
171 { 175 {
@@ -178,6 +182,7 @@ namespace OpenSim.Capabilities.Handlers
178 Array.Copy(mesh.Data, start, d, 0, len); 182 Array.Copy(mesh.Data, start, d, 0, len);
179 responsedata["bin_response_data"] = d; 183 responsedata["bin_response_data"] = d;
180 responsedata["int_bytes"] = len; 184 responsedata["int_bytes"] = len;
185 responsedata["reusecontext"] = false;
181 } 186 }
182 } 187 }
183 } 188 }
@@ -187,6 +192,7 @@ namespace OpenSim.Capabilities.Handlers
187 responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data); 192 responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
188 responsedata["content_type"] = "application/vnd.ll.mesh"; 193 responsedata["content_type"] = "application/vnd.ll.mesh";
189 responsedata["int_response_code"] = 200; 194 responsedata["int_response_code"] = 200;
195 responsedata["reusecontext"] = false;
190 } 196 }
191 } 197 }
192 else 198 else
@@ -194,6 +200,7 @@ namespace OpenSim.Capabilities.Handlers
194 responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data); 200 responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
195 responsedata["content_type"] = "application/vnd.ll.mesh"; 201 responsedata["content_type"] = "application/vnd.ll.mesh";
196 responsedata["int_response_code"] = 200; 202 responsedata["int_response_code"] = 200;
203 responsedata["reusecontext"] = false;
197 } 204 }
198 } 205 }
199 // Optionally add additional mesh types here 206 // Optionally add additional mesh types here
@@ -203,6 +210,7 @@ namespace OpenSim.Capabilities.Handlers
203 responsedata["content_type"] = "text/plain"; 210 responsedata["content_type"] = "text/plain";
204 responsedata["keepalive"] = false; 211 responsedata["keepalive"] = false;
205 responsedata["str_response_string"] = "Unfortunately, this asset isn't a mesh."; 212 responsedata["str_response_string"] = "Unfortunately, this asset isn't a mesh.";
213 responsedata["reusecontext"] = false;
206 return responsedata; 214 return responsedata;
207 } 215 }
208 } 216 }
@@ -212,6 +220,7 @@ namespace OpenSim.Capabilities.Handlers
212 responsedata["content_type"] = "text/plain"; 220 responsedata["content_type"] = "text/plain";
213 responsedata["keepalive"] = false; 221 responsedata["keepalive"] = false;
214 responsedata["str_response_string"] = "Your Mesh wasn't found. Sorry!"; 222 responsedata["str_response_string"] = "Your Mesh wasn't found. Sorry!";
223 responsedata["reusecontext"] = false;
215 return responsedata; 224 return responsedata;
216 } 225 }
217 } 226 }