aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs4
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs29
-rw-r--r--OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs6
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
5 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index fad9218..eaf8f60 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -827,9 +827,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
827 sendbuffer.Length, SocketFlags.None, m_Client.CircuitCode); 827 sendbuffer.Length, SocketFlags.None, m_Client.CircuitCode);
828 } 828 }
829 } 829 }
830 catch (NullReferenceException n) 830 catch (NullReferenceException)
831 { 831 {
832 m_log.Debug("[PACKET] Detected reuse of a returned packet"); 832 m_log.Error("[PACKET]: Detected reuse of a returned packet");
833 m_PacketQueue.Cancel(item.Sequence); 833 m_PacketQueue.Cancel(item.Sequence);
834 return; 834 return;
835 } 835 }
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
index 5be2a65..65138e2 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
@@ -45,8 +45,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
45 /// </summary> 45 /// </summary>
46 public class UserTextureDownloadService 46 public class UserTextureDownloadService
47 { 47 {
48 private static readonly ILog m_log 48// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 49
51 /// <summary> 50 /// <summary>
52 /// True if the service has been closed, probably because a user with texture requests still queued 51 /// True if the service has been closed, probably because a user with texture requests still queued
@@ -88,13 +87,13 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
88 /// XXX This is really a temporary solution to deal with the situation where a client continually requests 87 /// XXX This is really a temporary solution to deal with the situation where a client continually requests
89 /// the same missing textures 88 /// the same missing textures
90 /// </summary> 89 /// </summary>
91 private readonly IRequestLimitStrategy<UUID> missingTextureLimitStrategy 90// private readonly IRequestLimitStrategy<UUID> missingTextureLimitStrategy
92 = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS); 91// = new RepeatLimitStrategy<UUID>(MAX_ALLOWED_TEXTURE_REQUESTS);
93 92
94 public UserTextureDownloadService( 93 public UserTextureDownloadService(
95 IClientAPI client, Scene scene, OpenSim.Framework.BlockingQueue<ITextureSender> sharedQueue) 94 IClientAPI client, Scene scene, OpenSim.Framework.BlockingQueue<ITextureSender> sharedQueue)
96 { 95 {
97 m_client = client; 96// m_client = client;
98 m_scene = scene; 97 m_scene = scene;
99 m_sharedSendersQueue = sharedQueue; 98 m_sharedSendersQueue = sharedQueue;
100 } 99 }
@@ -231,16 +230,16 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
231 /// Place a ready texture sender on the processing queue. 230 /// Place a ready texture sender on the processing queue.
232 /// </summary> 231 /// </summary>
233 /// <param name="textureSender"></param> 232 /// <param name="textureSender"></param>
234 private void EnqueueTextureSender(ITextureSender textureSender) 233// private void EnqueueTextureSender(ITextureSender textureSender)
235 { 234// {
236 textureSender.Cancel = false; 235// textureSender.Cancel = false;
237 textureSender.Sending = true; 236// textureSender.Sending = true;
238 237//
239 if (!m_sharedSendersQueue.Contains(textureSender)) 238// if (!m_sharedSendersQueue.Contains(textureSender))
240 { 239// {
241 m_sharedSendersQueue.Enqueue(textureSender); 240// m_sharedSendersQueue.Enqueue(textureSender);
242 } 241// }
243 } 242// }
244 243
245 /// <summary> 244 /// <summary>
246 /// Close this module. 245 /// Close this module.
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 7082e85..ad42523 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -60,9 +60,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
60 60
61 public class UrlModule : ISharedRegionModule, IUrlModule 61 public class UrlModule : ISharedRegionModule, IUrlModule
62 { 62 {
63 private static readonly ILog m_log = 63// private static readonly ILog m_log =
64 LogManager.GetLogger( 64// LogManager.GetLogger(
65 MethodBase.GetCurrentMethod().DeclaringType); 65// MethodBase.GetCurrentMethod().DeclaringType);
66 66
67 private Dictionary<UUID, UrlData> m_RequestMap = 67 private Dictionary<UUID, UrlData> m_RequestMap =
68 new Dictionary<UUID, UrlData>(); 68 new Dictionary<UUID, UrlData>();
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 83db396..9805ff5 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -2863,7 +2863,8 @@ namespace OpenSim.Region.Physics.OdePlugin
2863 //if ((framecount % m_randomizeWater) == 0) 2863 //if ((framecount % m_randomizeWater) == 0)
2864 // randomizeWater(waterlevel); 2864 // randomizeWater(waterlevel);
2865 2865
2866 int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests(); 2866 //int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests();
2867 m_rayCastManager.ProcessQueuedRequests();
2867 2868
2868 collision_optimized(timeStep); 2869 collision_optimized(timeStep);
2869 2870
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index acab734..7f691ba 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9033,7 +9033,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9033 if (m.Success) { 9033 if (m.Success) {
9034 for (int i = 1; i < gnums.Length; i++) { 9034 for (int i = 1; i < gnums.Length; i++) {
9035 System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; 9035 System.Text.RegularExpressions.Group g = m.Groups[gnums[i]];
9036 CaptureCollection cc = g.Captures; 9036 //CaptureCollection cc = g.Captures;
9037 } 9037 }
9038 if (m.Groups.Count == 5) { 9038 if (m.Groups.Count == 5) {
9039 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); 9039 httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString())));