diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 5e8cd8e..cb8d4c8 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -69,7 +69,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
69 | public int startTime; | 69 | public int startTime; |
70 | public bool responseSent; | 70 | public bool responseSent; |
71 | public string uri; | 71 | public string uri; |
72 | public bool allowResponseType = false; | ||
73 | public UUID hostID; | 72 | public UUID hostID; |
74 | public Scene scene; | 73 | public Scene scene; |
75 | } | 74 | } |
@@ -383,10 +382,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
383 | { | 382 | { |
384 | string responseBody = body; | 383 | string responseBody = body; |
385 | 384 | ||
386 | // If we have no OpenID from built-in browser, disable this | ||
387 | if (!urlData.requests[request].allowResponseType) | ||
388 | urlData.requests[request].responseType = "text/plain"; | ||
389 | |||
390 | if (urlData.requests[request].responseType.Equals("text/plain")) | 385 | if (urlData.requests[request].responseType.Equals("text/plain")) |
391 | { | 386 | { |
392 | string value; | 387 | string value; |
@@ -703,32 +698,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
703 | string key = (string)header.Key; | 698 | string key = (string)header.Key; |
704 | string value = (string)header.Value; | 699 | string value = (string)header.Value; |
705 | requestData.headers.Add(key, value); | 700 | requestData.headers.Add(key, value); |
706 | if (key == "cookie") | ||
707 | { | ||
708 | string[] parts = value.Split(new char[] {'='}); | ||
709 | if (parts[0] == "agni_sl_session_id" && parts.Length > 1) | ||
710 | { | ||
711 | string cookie = Uri.UnescapeDataString(parts[1]); | ||
712 | string[] crumbs = cookie.Split(new char[] {':'}); | ||
713 | UUID owner; | ||
714 | if (crumbs.Length == 2 && UUID.TryParse(crumbs[0], out owner)) | ||
715 | { | ||
716 | if (crumbs[1].Length == 32) | ||
717 | { | ||
718 | Scene scene = requestData.scene; | ||
719 | if (scene != null) | ||
720 | { | ||
721 | SceneObjectPart host = scene.GetSceneObjectPart(requestData.hostID); | ||
722 | if (host != null) | ||
723 | { | ||
724 | if (host.OwnerID == owner) | ||
725 | requestData.allowResponseType = true; | ||
726 | } | ||
727 | } | ||
728 | } | ||
729 | } | ||
730 | } | ||
731 | } | ||
732 | } | 701 | } |
733 | foreach (DictionaryEntry de in request) | 702 | foreach (DictionaryEntry de in request) |
734 | { | 703 | { |