From 611ffa3f60c72fd0315be8841cddd8c0539d370d Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Tue, 23 Sep 2008 01:54:04 +0000
Subject: * 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.

---
 OpenSim/Framework/Servers/BaseHttpServer.cs                      | 9 +++++++--
 .../Environment/Modules/InterGrid/OpenGridProtocolModule.cs      | 4 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'OpenSim')

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
 
             LLSD llsdRequest = null;
             LLSD llsdResponse = null;
-
+            
             bool LegacyLLSDLoginLibOMV = (requestBody.Contains("passwd") && requestBody.Contains("mac") && requestBody.Contains("viewer_digest"));
-
+            
+            if (requestBody.Length == 0)
+            // Get Request
+            {
+                requestBody = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><llsd><map><key>request</key><string>get</string></map></llsd>"; 
+            }
             try
             {
                 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
             }
 
             responseMap["connect"] = LLSD.FromBoolean(true);
-            responseMap["rez_avatar/request"] = LLSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + requestpath);
+            LLSDMap capabilitiesMap = new LLSDMap();
+            capabilitiesMap["rez_avatar/request"] = LLSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + requestpath);
+            responseMap["capabilities"] = capabilitiesMap;
             
             return responseMap;
         }
-- 
cgit v1.1