aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SimStatsReporter.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs23
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/MaintenanceThread.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs4
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
3279 m_needAck.Add(Pack.Header.Sequence, Pack); 3279 m_needAck.Add(Pack.Header.Sequence, Pack);
3280 m_unAckedBytes += Pack.ToBytes().Length; 3280 m_unAckedBytes += Pack.ToBytes().Length;
3281 } 3281 }
3282 //BUG: severity=major - This looks like a framework bug!?
3282 catch (Exception) // HACKY 3283 catch (Exception) // HACKY
3283 { 3284 {
3284 // Ignore 3285 // 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
64 PendingDownloads = 19, 64 PendingDownloads = 19,
65 PendingUploads = 20, 65 PendingUploads = 20,
66 UnAckedBytes = 24, 66 UnAckedBytes = 24,
67
68 // Havok4 related... May or may not be in upcoming LLclients
69 // (kelly added them sometime late in January 2008)
70 NumRCCSLODReduced = 25,
71 NumRCCSFixed = 26
72 } 67 }
73 68
74 // Sending a stats update every 3 seconds 69 // 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
531 { 531 {
532 m_host.AddScriptLPS(1); 532 m_host.AddScriptLPS(1);
533 LLUUID keyID = LLUUID.Zero; 533 LLUUID keyID = LLUUID.Zero;
534 try 534 LLUUID.TryParse(id, out keyID);
535 { 535
536 if (id.Length > 0) keyID = new LLUUID(id);
537 }
538 catch
539 {
540 }
541 m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SenseOnce(m_localID, m_itemID, name, keyID, type, range, arc, m_host); 536 m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SenseOnce(m_localID, m_itemID, name, keyID, type, range, arc, m_host);
542 537
543 return; 538 return;
@@ -547,13 +542,7 @@ namespace OpenSim.Region.ScriptEngine.Common
547 { 542 {
548 m_host.AddScriptLPS(1); 543 m_host.AddScriptLPS(1);
549 LLUUID keyID = LLUUID.Zero; 544 LLUUID keyID = LLUUID.Zero;
550 try 545 LLUUID.TryParse(id, out keyID);
551 {
552 if (id.Length > 0) keyID = new LLUUID(id);
553 }
554 catch
555 {
556 }
557 546
558 m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SetSenseRepeatEvent(m_localID, m_itemID, name, keyID, type, range, arc, rate, m_host); 547 m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SetSenseRepeatEvent(m_localID, m_itemID, name, keyID, type, range, arc, rate, m_host);
559 return; 548 return;
@@ -2252,8 +2241,6 @@ namespace OpenSim.Region.ScriptEngine.Common
2252 2241
2253 m_host.AddScriptLPS(1); 2242 m_host.AddScriptLPS(1);
2254 2243
2255 bool attachment=false; // Attachments not implemented yet. TODO: reflect real attachemnt state
2256
2257 if (m_host.ParentGroup.RootPart.m_IsAttachment && agent == m_host.ParentGroup.RootPart.m_attachedAvatar) 2244 if (m_host.ParentGroup.RootPart.m_IsAttachment && agent == m_host.ParentGroup.RootPart.m_attachedAvatar)
2258 { 2245 {
2259 // When attached, certain permissions are implicit if requested from owner 2246 // When attached, certain permissions are implicit if requested from owner
@@ -3181,7 +3168,7 @@ namespace OpenSim.Region.ScriptEngine.Common
3181 { 3168 {
3182 return Convert.ToInt32(src.Data[index]); 3169 return Convert.ToInt32(src.Data[index]);
3183 } 3170 }
3184 catch (FormatException e) 3171 catch (FormatException)
3185 { 3172 {
3186 return 0; 3173 return 0;
3187 } 3174 }
@@ -3216,7 +3203,7 @@ namespace OpenSim.Region.ScriptEngine.Common
3216 { 3203 {
3217 return Convert.ToDouble(src.Data[index]); 3204 return Convert.ToDouble(src.Data[index]);
3218 } 3205 }
3219 catch (FormatException e) 3206 catch (FormatException)
3220 { 3207 {
3221 return 0.0; 3208 return 0.0;
3222 } 3209 }
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
218 //} 218 //}
219 } 219 }
220 } 220 }
221 catch(ThreadAbortException ex) 221 catch(ThreadAbortException)
222 { 222 {
223 m_log.Error("Thread aborted in MaintenanceLoopThread. If this is during shutdown, please ignore"); 223 m_log.Error("Thread aborted in MaintenanceLoopThread. If this is during shutdown, please ignore");
224 } 224 }
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
335 ExecutorBase.scriptEvents evflags = Script.Exec.GetStateEventFlags(); 335 ExecutorBase.scriptEvents evflags = Script.Exec.GetStateEventFlags();
336 return (int)evflags; 336 return (int)evflags;
337 } 337 }
338 catch (Exception e) 338 catch (Exception)
339 { 339 {
340 // Console.WriteLine("Failed to get script reference for <" + localID + "," + itemID + ">");
341 // Console.WriteLine(e.ToString());
342 } 340 }
343 341
344 return 0; 342 return 0;