diff options
author | Teravus Ovares | 2008-09-23 01:54:04 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-23 01:54:04 +0000 |
commit | 611ffa3f60c72fd0315be8841cddd8c0539d370d (patch) | |
tree | fb728e52cffd5d1500b8d32a85367b2bdc53266e /OpenSim | |
parent | Move script and notecard open perms checks from ClientView to the (diff) | |
download | opensim-SC-611ffa3f60c72fd0315be8841cddd8c0539d370d.zip opensim-SC-611ffa3f60c72fd0315be8841cddd8c0539d370d.tar.gz opensim-SC-611ffa3f60c72fd0315be8841cddd8c0539d370d.tar.bz2 opensim-SC-611ffa3f60c72fd0315be8841cddd8c0539d370d.tar.xz |
* Update in OGP draft 3 protocol spec with regards to seed region requests running over GET instead of POST and the rez_avatar/request cap being wrapped in the capabilities map.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 86ce4c3..4399a75 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -607,9 +607,14 @@ namespace OpenSim.Framework.Servers | |||
607 | 607 | ||
608 | LLSD llsdRequest = null; | 608 | LLSD llsdRequest = null; |
609 | LLSD llsdResponse = null; | 609 | LLSD llsdResponse = null; |
610 | 610 | ||
611 | bool LegacyLLSDLoginLibOMV = (requestBody.Contains("passwd") && requestBody.Contains("mac") && requestBody.Contains("viewer_digest")); | 611 | bool LegacyLLSDLoginLibOMV = (requestBody.Contains("passwd") && requestBody.Contains("mac") && requestBody.Contains("viewer_digest")); |
612 | 612 | ||
613 | if (requestBody.Length == 0) | ||
614 | // Get Request | ||
615 | { | ||
616 | requestBody = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><llsd><map><key>request</key><string>get</string></map></llsd>"; | ||
617 | } | ||
613 | try | 618 | try |
614 | { | 619 | { |
615 | llsdRequest = LLSDParser.DeserializeXml(requestBody); | 620 | llsdRequest = LLSDParser.DeserializeXml(requestBody); |
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index b32985a..0cbc128 100644 --- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -335,7 +335,9 @@ namespace OpenSim.Region.Environment.Modules.InterGrid | |||
335 | } | 335 | } |
336 | 336 | ||
337 | responseMap["connect"] = LLSD.FromBoolean(true); | 337 | responseMap["connect"] = LLSD.FromBoolean(true); |
338 | responseMap["rez_avatar/request"] = LLSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + requestpath); | 338 | LLSDMap capabilitiesMap = new LLSDMap(); |
339 | capabilitiesMap["rez_avatar/request"] = LLSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + requestpath); | ||
340 | responseMap["capabilities"] = capabilitiesMap; | ||
339 | 341 | ||
340 | return responseMap; | 342 | return responseMap; |
341 | } | 343 | } |