* You can haz more spring cleaning.

* Eventually this codebase will be clean. >_>

5 files changed, 8 insertions, 27 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 0ea7e0a..aa27fdd 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3279,6 +3279,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         m_needAck.Add(Pack.Header.Sequence, Pack);
                         m_unAckedBytes += Pack.ToBytes().Length;
                     }
+                        //BUG: severity=major - This looks like a framework bug!?
                     catch (Exception) // HACKY
                     {
                         // Ignore
diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
index a53bfcd..a150164 100644
--- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
@@ -64,11 +64,6 @@ namespace OpenSim.Region.Environment.Scenes
             PendingDownloads = 19,
             PendingUploads = 20,
             UnAckedBytes = 24,
-
-            // Havok4 related...   May or may not be in upcoming LLclients
-            // (kelly added them sometime late in January 2008)
-            NumRCCSLODReduced = 25,
-            NumRCCSFixed = 26
         }
 
         // Sending a stats update every 3 seconds
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 1f23d00..74494d9 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -531,13 +531,8 @@ namespace OpenSim.Region.ScriptEngine.Common
         {
             m_host.AddScriptLPS(1);
             LLUUID keyID = LLUUID.Zero;
-            try
-            {
-                if (id.Length > 0) keyID = new LLUUID(id);
-            }
-            catch 
-            { 
-            }
+            LLUUID.TryParse(id, out keyID);
+            
             m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SenseOnce(m_localID, m_itemID, name, keyID, type, range, arc, m_host);
 
             return;
@@ -547,13 +542,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         {
             m_host.AddScriptLPS(1);
             LLUUID keyID = LLUUID.Zero;
-            try
-            {
-                if (id.Length > 0) keyID = new LLUUID(id);
-            }
-            catch
-            {
-            }
+            LLUUID.TryParse(id, out keyID);
 
             m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SetSenseRepeatEvent(m_localID, m_itemID, name, keyID, type, range, arc, rate, m_host);
             return;
@@ -2252,8 +2241,6 @@ namespace OpenSim.Region.ScriptEngine.Common
 
             m_host.AddScriptLPS(1);
 
-            bool attachment=false; // Attachments not implemented yet. TODO: reflect real attachemnt state
-
             if (m_host.ParentGroup.RootPart.m_IsAttachment && agent == m_host.ParentGroup.RootPart.m_attachedAvatar)
             {
                 // When attached, certain permissions are implicit if requested from owner
@@ -3181,7 +3168,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             {
                 return Convert.ToInt32(src.Data[index]);
             }
-            catch (FormatException e)
+            catch (FormatException)
             {
                 return 0;
             }
@@ -3216,7 +3203,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             {
                 return Convert.ToDouble(src.Data[index]);
             }
-            catch (FormatException e)
+            catch (FormatException)
             {
                 return 0.0;
             }
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
index 3e9fc65..3320ddb 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
@@ -218,7 +218,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
                         //}
                     }
                 }
-                catch(ThreadAbortException ex)
+                catch(ThreadAbortException)
                 {
                     m_log.Error("Thread aborted in MaintenanceLoopThread.  If this is during shutdown, please ignore");
                 }
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
index 9d1cd6c..da30535 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
@@ -335,10 +335,8 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
                 ExecutorBase.scriptEvents evflags = Script.Exec.GetStateEventFlags();
                 return (int)evflags;
             }
-            catch (Exception e)
+            catch (Exception)
             {
-                // Console.WriteLine("Failed to get script reference for <" + localID + "," + itemID + ">");
-                // Console.WriteLine(e.ToString());
             }
 
             return 0;