From 023faa227ef72a3701dc5fbfc46ab5f831c54953 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 29 Mar 2013 23:10:28 +0000
Subject: Check viewer 2/3 attachment calls against avatar appearance
 attachment data rather than actually attached objects

By checking against the grid's Avatar data, we can ignore viewer side attachments but still initiate these calls simulator-side.
Initiating simulator-side is always necessary for version 1 viewers.
This is a further commit to resolve http://opensimulator.org/mantis/view.php?id=6581
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4930a39..215a689 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -955,15 +955,12 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 // Viewers which have a current outfit folder will actually rez their own attachments.  However,
                 // viewers without (e.g. v1 viewers) will not, so we still need to make this call.
-                // 
-                // However, we leave a 5 second pause to try and avoid a clash with viewers that are rezzing 
-                // attachments themselves.  This should then mean that this call ends up doing nothing.
                 if (Scene.AttachmentsModule != null)
                     Util.FireAndForget(
                         o => 
                         { 
-                            if (PresenceType != PresenceType.Npc && Util.FireAndForgetMethod != FireAndForgetMethod.None) 
-                                System.Threading.Thread.Sleep(5000); 
+//                            if (PresenceType != PresenceType.Npc && Util.FireAndForgetMethod != FireAndForgetMethod.None) 
+//                                System.Threading.Thread.Sleep(7000); 
 
                             Scene.AttachmentsModule.RezAttachments(this); 
                         });
-- 
cgit v1.1


From cbc9ae898c474295567532c668644d09b698d59b Mon Sep 17 00:00:00 2001
From: Kevin Cozens
Date: Wed, 27 Mar 2013 17:26:17 -0400
Subject: Added missing functionality (mainly custom headers) to llHTTPRequest.

---
 OpenSim/Region/Framework/Interfaces/IHttpRequests.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
index de0f2a3..eb6c5ac 100644
--- a/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
+++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
@@ -36,6 +36,9 @@ namespace OpenSim.Region.Framework.Interfaces
         HTTP_MIMETYPE = 1,
         HTTP_BODY_MAXLENGTH = 2,
         HTTP_VERIFY_CERT = 3,
+        HTTP_VERBOSE_THROTTLE = 4,
+        HTTP_CUSTOM_HEADER = 5,
+        HTTP_PRAGMA_NO_CACHE = 6
     }
 
     public interface IHttpRequestModule
-- 
cgit v1.1