aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IHttpRequests.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
2 files changed, 5 insertions, 5 deletions
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
36 HTTP_MIMETYPE = 1, 36 HTTP_MIMETYPE = 1,
37 HTTP_BODY_MAXLENGTH = 2, 37 HTTP_BODY_MAXLENGTH = 2,
38 HTTP_VERIFY_CERT = 3, 38 HTTP_VERIFY_CERT = 3,
39 HTTP_VERBOSE_THROTTLE = 4,
40 HTTP_CUSTOM_HEADER = 5,
41 HTTP_PRAGMA_NO_CACHE = 6
39 } 42 }
40 43
41 public interface IHttpRequestModule 44 public interface IHttpRequestModule
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f01a916..0ab267a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1100,15 +1100,12 @@ namespace OpenSim.Region.Framework.Scenes
1100 { 1100 {
1101 // Viewers which have a current outfit folder will actually rez their own attachments. However, 1101 // Viewers which have a current outfit folder will actually rez their own attachments. However,
1102 // viewers without (e.g. v1 viewers) will not, so we still need to make this call. 1102 // viewers without (e.g. v1 viewers) will not, so we still need to make this call.
1103 //
1104 // However, we leave a 5 second pause to try and avoid a clash with viewers that are rezzing
1105 // attachments themselves. This should then mean that this call ends up doing nothing.
1106 if (Scene.AttachmentsModule != null) 1103 if (Scene.AttachmentsModule != null)
1107 Util.FireAndForget( 1104 Util.FireAndForget(
1108 o => 1105 o =>
1109 { 1106 {
1110 if (PresenceType != PresenceType.Npc && Util.FireAndForgetMethod != FireAndForgetMethod.None) 1107// if (PresenceType != PresenceType.Npc && Util.FireAndForgetMethod != FireAndForgetMethod.None)
1111 System.Threading.Thread.Sleep(5000); 1108// System.Threading.Thread.Sleep(7000);
1112 1109
1113 Scene.AttachmentsModule.RezAttachments(this); 1110 Scene.AttachmentsModule.RezAttachments(this);
1114 }); 1111 });