aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2012-12-01 12:39:55 +0000
committerUbitUmarov2012-12-01 12:39:55 +0000
commit9c7c7033601a1089bcb856917cff7e8d55fb11dc (patch)
treea01fb8d6f070c514372a24de5fb971a0735847d6 /OpenSim
parentdon't zero constant force and torque in selection (diff)
parentMerge branch 'teravuswork' of careminster:/var/git/careminster into teravuswork (diff)
downloadopensim-SC_OLD-9c7c7033601a1089bcb856917cff7e8d55fb11dc.zip
opensim-SC_OLD-9c7c7033601a1089bcb856917cff7e8d55fb11dc.tar.gz
opensim-SC_OLD-9c7c7033601a1089bcb856917cff7e8d55fb11dc.tar.bz2
opensim-SC_OLD-9c7c7033601a1089bcb856917cff7e8d55fb11dc.tar.xz
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
index 380705f..ec574a3 100644
--- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Capabilities.Handlers
64 ret["keepalive"] = false; 64 ret["keepalive"] = false;
65 ret["reusecontext"] = false; 65 ret["reusecontext"] = false;
66 ret["int_bytes"] = 0; 66 ret["int_bytes"] = 0;
67 ret["int_lod"] = 0;
67 string MeshStr = (string)request["mesh_id"]; 68 string MeshStr = (string)request["mesh_id"];
68 69
69 70
@@ -100,6 +101,8 @@ namespace OpenSim.Capabilities.Handlers
100 responsedata["keepalive"] = false; 101 responsedata["keepalive"] = false;
101 responsedata["str_response_string"] = "Request wasn't what was expected"; 102 responsedata["str_response_string"] = "Request wasn't what was expected";
102 responsedata["reusecontext"] = false; 103 responsedata["reusecontext"] = false;
104 responsedata["int_lod"] = 0;
105 responsedata["int_bytes"] = 0;
103 106
104 string meshStr = string.Empty; 107 string meshStr = string.Empty;
105 108