diff options
Diffstat (limited to 'OpenSim/Region')
19 files changed, 28 insertions, 29 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 6f5775a..50b83f6 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -503,7 +503,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
503 | errorResponse.state = "error"; | 503 | errorResponse.state = "error"; |
504 | errorResponse.error = resperror; | 504 | errorResponse.error = resperror; |
505 | return errorResponse; | 505 | return errorResponse; |
506 | break; | 506 | // break; |
507 | case FileAgentInventoryState.waitUpload: | 507 | case FileAgentInventoryState.waitUpload: |
508 | // todo stop current uploader server | 508 | // todo stop current uploader server |
509 | break; | 509 | break; |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 2ff6ced..edd22a8 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -335,7 +335,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
335 | private readonly byte[] m_channelVersion = Utils.EmptyBytes; | 335 | private readonly byte[] m_channelVersion = Utils.EmptyBytes; |
336 | private readonly IGroupsModule m_GroupsModule; | 336 | private readonly IGroupsModule m_GroupsModule; |
337 | 337 | ||
338 | private int m_cachedTextureSerial; | 338 | // private int m_cachedTextureSerial; |
339 | private PriorityQueue m_entityUpdates; | 339 | private PriorityQueue m_entityUpdates; |
340 | private PriorityQueue m_entityProps; | 340 | private PriorityQueue m_entityProps; |
341 | private Prioritizer m_prioritizer; | 341 | private Prioritizer m_prioritizer; |
@@ -344,7 +344,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
344 | // needs optimazation | 344 | // needs optimazation |
345 | private HashSet<SceneObjectGroup> GroupsInView = new HashSet<SceneObjectGroup>(); | 345 | private HashSet<SceneObjectGroup> GroupsInView = new HashSet<SceneObjectGroup>(); |
346 | 346 | ||
347 | private bool m_VelocityInterpolate = false; | 347 | // private bool m_VelocityInterpolate = false; |
348 | private const uint MaxTransferBytesPerPacket = 600; | 348 | private const uint MaxTransferBytesPerPacket = 600; |
349 | 349 | ||
350 | /// <value> | 350 | /// <value> |
@@ -6660,7 +6660,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6660 | p.AgentData.AgentID != AgentId) | 6660 | p.AgentData.AgentID != AgentId) |
6661 | return true; | 6661 | return true; |
6662 | 6662 | ||
6663 | m_VelocityInterpolate = false; | 6663 | // m_VelocityInterpolate = false; |
6664 | return true; | 6664 | return true; |
6665 | } | 6665 | } |
6666 | 6666 | ||
@@ -6671,7 +6671,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6671 | p.AgentData.AgentID != AgentId) | 6671 | p.AgentData.AgentID != AgentId) |
6672 | return true; | 6672 | return true; |
6673 | 6673 | ||
6674 | m_VelocityInterpolate = true; | 6674 | // m_VelocityInterpolate = true; |
6675 | return true; | 6675 | return true; |
6676 | } | 6676 | } |
6677 | 6677 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 9f52a14..4afac28 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -369,7 +369,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
369 | { | 369 | { |
370 | string xmlData; | 370 | string xmlData; |
371 | XmlDocument d = null; | 371 | XmlDocument d = null; |
372 | UUID asset; | 372 | // UUID asset; |
373 | if (itemData.TryGetValue(attach.ItemID, out xmlData)) | 373 | if (itemData.TryGetValue(attach.ItemID, out xmlData)) |
374 | { | 374 | { |
375 | d = new XmlDocument(); | 375 | d = new XmlDocument(); |
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index f5b575b..84b4707 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
@@ -666,7 +666,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
666 | ResponseBody = e.Message; | 666 | ResponseBody = e.Message; |
667 | } | 667 | } |
668 | } | 668 | } |
669 | catch (Exception e) | 669 | catch (Exception) |
670 | { | 670 | { |
671 | // Don't crash on anything else | 671 | // Don't crash on anything else |
672 | } | 672 | } |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 4471432..ce67fcc 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -1396,9 +1396,8 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1396 | byte[] tempConvertArr = new byte[LandBitmap.GetLength(0) * LandBitmap.GetLength(1) / 8]; | 1396 | byte[] tempConvertArr = new byte[LandBitmap.GetLength(0) * LandBitmap.GetLength(1) / 8]; |
1397 | 1397 | ||
1398 | int tempByte = 0; | 1398 | int tempByte = 0; |
1399 | int i, byteNum = 0; | 1399 | int byteNum = 0; |
1400 | int mask = 1; | 1400 | int mask = 1; |
1401 | i = 0; | ||
1402 | for (int y = 0; y < LandBitmap.GetLength(1); y++) | 1401 | for (int y = 0; y < LandBitmap.GetLength(1); y++) |
1403 | { | 1402 | { |
1404 | for (int x = 0; x < LandBitmap.GetLength(0); x++) | 1403 | for (int x = 0; x < LandBitmap.GetLength(0); x++) |
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 7b7cce8..fb94853 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | |||
@@ -564,7 +564,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
564 | sculpt.Dispose(); | 564 | sculpt.Dispose(); |
565 | } | 565 | } |
566 | } | 566 | } |
567 | catch (Exception e) | 567 | catch /*(Exception e)*/ |
568 | { | 568 | { |
569 | Vector3 objectPos = prim.ParentGroup.RootPart.AbsolutePosition; | 569 | Vector3 objectPos = prim.ParentGroup.RootPart.AbsolutePosition; |
570 | //// TODO - print out owner of SceneObjectPart prim. | 570 | //// TODO - print out owner of SceneObjectPart prim. |
@@ -748,7 +748,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
748 | using (Bitmap img = (Bitmap)imgDecoder.DecodeToImage(asset)) | 748 | using (Bitmap img = (Bitmap)imgDecoder.DecodeToImage(asset)) |
749 | ret = new warp_Texture(img); | 749 | ret = new warp_Texture(img); |
750 | } | 750 | } |
751 | catch (Exception e) | 751 | catch /*(Exception e)*/ |
752 | { | 752 | { |
753 | m_log.Debug(string.Format("[WARP 3D IMAGE MODULE]: Failed to decode asset {0}, exception ", id)); | 753 | m_log.Debug(string.Format("[WARP 3D IMAGE MODULE]: Failed to decode asset {0}, exception ", id)); |
754 | } | 754 | } |
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index b1eb0a5..96ba003 100644 --- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs +++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules | |||
47 | 47 | ||
48 | private uint m_frame = 0; | 48 | private uint m_frame = 0; |
49 | private int m_dataVersion = 0; | 49 | private int m_dataVersion = 0; |
50 | private int m_regionID = 0; | 50 | // private int m_regionID = 0; |
51 | private int m_frameUpdateRate = 150; | 51 | private int m_frameUpdateRate = 150; |
52 | //private Random m_rndnums = new Random(Environment.TickCount); | 52 | //private Random m_rndnums = new Random(Environment.TickCount); |
53 | private Scene m_scene = null; | 53 | private Scene m_scene = null; |
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index 80ee510..e2786da 100644 --- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs +++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |||
@@ -669,7 +669,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
669 | if (m_group == null) | 669 | if (m_group == null) |
670 | return; | 670 | return; |
671 | 671 | ||
672 | bool update = false; | 672 | // bool update = false; |
673 | 673 | ||
674 | if (m_selected) | 674 | if (m_selected) |
675 | { | 675 | { |
@@ -724,7 +724,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
724 | 724 | ||
725 | m_currentFrame.TimeMS += (int)tickDuration; | 725 | m_currentFrame.TimeMS += (int)tickDuration; |
726 | m_lasttickMS = nowMS - 50f; | 726 | m_lasttickMS = nowMS - 50f; |
727 | update = true; | 727 | // update = true; |
728 | } | 728 | } |
729 | 729 | ||
730 | int elapsed = (int)(nowMS - m_lasttickMS); | 730 | int elapsed = (int)(nowMS - m_lasttickMS); |
@@ -761,7 +761,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
761 | else | 761 | else |
762 | m_group.RootPart.Velocity = Vector3.Zero; | 762 | m_group.RootPart.Velocity = Vector3.Zero; |
763 | } | 763 | } |
764 | update = true; | 764 | // update = true; |
765 | } | 765 | } |
766 | else | 766 | else |
767 | { | 767 | { |
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 1e418df..1fea656 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs | |||
@@ -196,7 +196,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
196 | 196 | ||
197 | public void SendSimOnlineNotification(ulong regionHandle) | 197 | public void SendSimOnlineNotification(ulong regionHandle) |
198 | { | 198 | { |
199 | RegionInfo Result = null; | 199 | // RegionInfo Result = null; |
200 | 200 | ||
201 | Scene s = m_localScenes.FindValue(delegate(Scene x) | 201 | Scene s = m_localScenes.FindValue(delegate(Scene x) |
202 | { | 202 | { |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 74f765d..8055f92 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -77,7 +77,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
77 | public class ScenePresence : EntityBase, IScenePresence | 77 | public class ScenePresence : EntityBase, IScenePresence |
78 | { | 78 | { |
79 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 79 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
80 | private static readonly String LogHeader = "[SCENE PRESENCE]"; | 80 | // private static readonly String LogHeader = "[SCENE PRESENCE]"; |
81 | 81 | ||
82 | // ~ScenePresence() | 82 | // ~ScenePresence() |
83 | // { | 83 | // { |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs index 4024fea..8fa4409 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | |||
@@ -179,7 +179,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
179 | i++; | 179 | i++; |
180 | } | 180 | } |
181 | } | 181 | } |
182 | catch (Exception e) | 182 | catch /*(Exception e)*/ |
183 | { | 183 | { |
184 | m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed "); | 184 | m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed "); |
185 | //// m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); | 185 | //// m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index c2b075c..ab70010 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -69,7 +69,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
69 | { | 69 | { |
70 | return FromOriginalXmlFormat(reader); | 70 | return FromOriginalXmlFormat(reader); |
71 | } | 71 | } |
72 | catch (Exception e) | 72 | catch /*(Exception e)*/ |
73 | { | 73 | { |
74 | m_log.Error("[SERIALIZER]: Deserialization of xml failed "); | 74 | m_log.Error("[SERIALIZER]: Deserialization of xml failed "); |
75 | //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); | 75 | //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); |
@@ -314,7 +314,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
314 | // sceneObject.AggregatePerms(); | 314 | // sceneObject.AggregatePerms(); |
315 | return sceneObject; | 315 | return sceneObject; |
316 | } | 316 | } |
317 | catch (Exception e) | 317 | catch /*(Exception e)*/ |
318 | { | 318 | { |
319 | m_log.Error("[SERIALIZER]: Deserialization of xml failed "); | 319 | m_log.Error("[SERIALIZER]: Deserialization of xml failed "); |
320 | //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); | 320 | //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); |
@@ -1402,7 +1402,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1402 | value = reader.ReadElementContentAsString("Media", String.Empty); | 1402 | value = reader.ReadElementContentAsString("Media", String.Empty); |
1403 | shp.Media = PrimitiveBaseShape.MediaList.FromXml(value); | 1403 | shp.Media = PrimitiveBaseShape.MediaList.FromXml(value); |
1404 | } | 1404 | } |
1405 | catch (XmlException e) | 1405 | catch (XmlException) |
1406 | { | 1406 | { |
1407 | // There are versions of OAR files that contain unquoted XML. | 1407 | // There are versions of OAR files that contain unquoted XML. |
1408 | // ie ONE comercial fork that never wanted their oars to be read by our code | 1408 | // ie ONE comercial fork that never wanted their oars to be read by our code |
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs index 2a1ae45..29685da 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs | |||
@@ -163,7 +163,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics | |||
163 | { | 163 | { |
164 | // Console.WriteLine("Simulating"); | 164 | // Console.WriteLine("Simulating"); |
165 | 165 | ||
166 | float fps = 0; | 166 | // float fps = 0; |
167 | for (int i = 0; i < _actors.Count; ++i) | 167 | for (int i = 0; i < _actors.Count; ++i) |
168 | { | 168 | { |
169 | BasicActor actor = _actors[i]; | 169 | BasicActor actor = _actors[i]; |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs index d182c34..6b32bf8 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs | |||
@@ -56,7 +56,7 @@ public sealed class BSCharacter : BSPhysObject | |||
56 | private float _buoyancy; | 56 | private float _buoyancy; |
57 | 57 | ||
58 | private OMV.Vector3 _size; | 58 | private OMV.Vector3 _size; |
59 | private float _footOffset; | 59 | private float _footOffset = 0; |
60 | 60 | ||
61 | private BSActorAvatarMove m_moveActor; | 61 | private BSActorAvatarMove m_moveActor; |
62 | private const string AvatarMoveActorName = "BSCharacter.AvatarMove"; | 62 | private const string AvatarMoveActorName = "BSCharacter.AvatarMove"; |
diff --git a/OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs index bfa95c1..a6f587e 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Region.PhysicsModule.BulletS.Tests | |||
51 | BSScene _physicsScene { get; set; } | 51 | BSScene _physicsScene { get; set; } |
52 | BSPrim _targetSphere { get; set; } | 52 | BSPrim _targetSphere { get; set; } |
53 | Vector3 _targetSpherePosition { get; set; } | 53 | Vector3 _targetSpherePosition { get; set; } |
54 | float _simulationTimeStep = 0.089f; | 54 | // float _simulationTimeStep = 0.089f; |
55 | 55 | ||
56 | uint _targetLocalID = 123; | 56 | uint _targetLocalID = 123; |
57 | 57 | ||
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs index 49559bf..99c43b4 100644 --- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs | |||
@@ -1383,7 +1383,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing | |||
1383 | { | 1383 | { |
1384 | File.Delete(filename); | 1384 | File.Delete(filename); |
1385 | } | 1385 | } |
1386 | catch (IOException e) | 1386 | catch (IOException) |
1387 | { | 1387 | { |
1388 | m_log.ErrorFormat( | 1388 | m_log.ErrorFormat( |
1389 | "[MESH CACHE]: Failed to delete file {0}",filename); | 1389 | "[MESH CACHE]: Failed to delete file {0}",filename); |
@@ -1596,7 +1596,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing | |||
1596 | 1596 | ||
1597 | return false; | 1597 | return false; |
1598 | } | 1598 | } |
1599 | return false; | 1599 | // return false; |
1600 | } | 1600 | } |
1601 | } | 1601 | } |
1602 | } | 1602 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs index 66210b7..9dc8d05 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs | |||
@@ -19720,7 +19720,7 @@ public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool | |||
19720 | case 1076: ; | 19720 | case 1076: ; |
19721 | break; | 19721 | break; |
19722 | case 1032: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } | 19722 | case 1032: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } |
19723 | break; | 19723 | // break; |
19724 | case 1067: ; | 19724 | case 1067: ; |
19725 | break; | 19725 | break; |
19726 | case 1072: ; | 19726 | case 1072: ; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 9d72b1c..5342c28 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -771,7 +771,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
771 | /// <returns></returns> | 771 | /// <returns></returns> |
772 | public object EventProcessor() | 772 | public object EventProcessor() |
773 | { | 773 | { |
774 | EventParams data = null; | 774 | // EventParams data = null; |
775 | // We check here as the thread stopping this instance from running may itself hold the m_Script lock. | 775 | // We check here as the thread stopping this instance from running may itself hold the m_Script lock. |
776 | if (!Running) | 776 | if (!Running) |
777 | return 0; | 777 | return 0; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs index 241a24d..8ceb4cc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs | |||
@@ -157,7 +157,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
157 | using (HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse()) | 157 | using (HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse()) |
158 | {} | 158 | {} |
159 | } | 159 | } |
160 | catch (WebException e) | 160 | catch (WebException) |
161 | { | 161 | { |
162 | // using (HttpWebResponse response = (HttpWebResponse)e.Response) | 162 | // using (HttpWebResponse response = (HttpWebResponse)e.Response) |
163 | // gotExpectedException = response.StatusCode == HttpStatusCode.NotFound; | 163 | // gotExpectedException = response.StatusCode == HttpStatusCode.NotFound; |