ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

* You can haz more spring cleaning.

Browse Source 
* Eventually this codebase will be clean. >_>
This commit is contained in:
Adam Frisby
2008-05-08 05:35:01 +00:00
parent 872af8e04d
commit 4fa0cbdfbb
9 changed files with 25 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@@ -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

5
OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
View File

@@ -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

23
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@@ -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;
}

2
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs
View File

@@ -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");
}

4
OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs
View File

@@ -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;