aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-01-07 20:00:37 +0000
committerTeravus Ovares2008-01-07 20:00:37 +0000
commit6e8c3ac78229b2176cfc3a1dff6001c3ab355f8b (patch)
tree3afa9e686e27c8852c77d22f4f7610a1346ef7e2
parent* Message Server stuff. (diff)
downloadopensim-SC_OLD-6e8c3ac78229b2176cfc3a1dff6001c3ab355f8b.zip
opensim-SC_OLD-6e8c3ac78229b2176cfc3a1dff6001c3ab355f8b.tar.gz
opensim-SC_OLD-6e8c3ac78229b2176cfc3a1dff6001c3ab355f8b.tar.bz2
opensim-SC_OLD-6e8c3ac78229b2176cfc3a1dff6001c3ab355f8b.tar.xz
* Enabling the LLSD Login method by jhurliman so libSecondLife clients work on OpenSim again.
-rw-r--r--CONTRIBUTORS.txt2
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs6
2 files changed, 5 insertions, 3 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 88bd970..14c4365 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -28,6 +28,7 @@ Patches
28* Danx0r 28* Danx0r
29* Dalien 29* Dalien
30* Darok 30* Darok
31* jhurliman (LLSD Login)
31 32
32LSL Devs 33LSL Devs
33 34
@@ -50,6 +51,7 @@ This software uses components from the following developers:
50* AGEIA Inc. (PhysX) 51* AGEIA Inc. (PhysX)
51* Russel L. Smith (ODE) 52* Russel L. Smith (ODE)
52* Prebuild ( http://sourceforge.net/projects/dnpb/ ) 53* Prebuild ( http://sourceforge.net/projects/dnpb/ )
54* LibSecondLife ( http://www.libsecondlife.org/wiki/Main_Page )
53 55
54In addition, we would like to thank: 56In addition, we would like to thank:
55* The Mono Project 57* The Mono Project
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index b36cc8a..004b330 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -145,9 +145,9 @@ namespace OpenSim.Framework.Servers
145 { 145 {
146 switch (request.ContentType) 146 switch (request.ContentType)
147 { 147 {
148 //case "application/xml+llsd": 148 case "application/xml+llsd":
149 //HandleLLSDRequests(request, response); 149 HandleLLSDRequests(request, response);
150 //break; 150 break;
151 case "text/xml": 151 case "text/xml":
152 case "application/xml": 152 case "application/xml":
153 default: 153 default: