aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetServer
diff options
context:
space:
mode:
authorlbsa712007-07-02 08:03:11 +0000
committerlbsa712007-07-02 08:03:11 +0000
commit686f6a83319eaccd27f426eda82c020246566963 (patch)
tree1a2f4d75316282d4d36de11789af7d0e91950254 /OpenSim/Grid/AssetServer
parent* Applied Weathros/tedd's IP v6 patch (diff)
downloadopensim-SC-686f6a83319eaccd27f426eda82c020246566963.zip
opensim-SC-686f6a83319eaccd27f426eda82c020246566963.tar.gz
opensim-SC-686f6a83319eaccd27f426eda82c020246566963.tar.bz2
opensim-SC-686f6a83319eaccd27f426eda82c020246566963.tar.xz
* Fixed Issue #161 by using PhysicsScene.Null instead of BasePhysicsScene
* Hid NullPhysicsScene for great justice * Fixed broken Grid build
Diffstat (limited to 'OpenSim/Grid/AssetServer')
-rw-r--r--OpenSim/Grid/AssetServer/AssetHttpServer.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Grid/AssetServer/AssetHttpServer.cs b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
index ad8733f..31cb379 100644
--- a/OpenSim/Grid/AssetServer/AssetHttpServer.cs
+++ b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Grid.AssetServer
94 94
95 case "application/xml": 95 case "application/xml":
96 // probably LLSD we hope, otherwise it should be ignored by the parser 96 // probably LLSD we hope, otherwise it should be ignored by the parser
97 responseString = ParseLLSDXML(requestBody); 97 responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
98 response.AddHeader("Content-type", "application/xml"); 98 response.AddHeader("Content-type", "application/xml");
99 break; 99 break;
100 100