From aab6cdd8b05a97c8906a67eb8d3233580fbebb2f Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sun, 5 Oct 2008 14:15:39 +0000 Subject: [PATCH] Update svn properties, minor formatting cleanup. --- OpenSim/Grid/UserServer/UserLoginService.cs | 2 +- .../Region/Environment/Scenes/InnerScene.cs | 16 ++++----- .../Environment/Scenes/Scene.Inventory.cs | 4 +-- OpenSim/Region/Environment/Scenes/Scene.cs | 2 +- .../Environment/Scenes/SceneObjectGroup.cs | 2 +- .../DotNetEngine/EventQueueThreadClass.cs | 36 +++++++++---------- .../Shared/Api/Implementation/LSL_Api.cs | 2 +- .../Shared/Api/Implementation/OSSL_Api.cs | 14 ++++---- .../Shared/Api/Interface/IOSSL_Api.cs | 2 +- .../Shared/Api/Runtime/Executor.cs | 26 +++++++------- .../Shared/Api/Runtime/OSSL_Stub.cs | 10 +++--- 11 files changed, 58 insertions(+), 58 deletions(-) diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index fa3cfbd367..1a697600ec 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs @@ -460,7 +460,7 @@ namespace OpenSim.Grid.UserServer UUID uid; string pass = requestData["password"].ToString(); - if(!UUID.TryParse((string) requestData["avatar_uuid"], out uid)) + if (!UUID.TryParse((string) requestData["avatar_uuid"], out uid)) { responseData["error"] = "No authorization"; response.Value = responseData; diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 6b3e796e1f..fdde801473 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -857,7 +857,7 @@ namespace OpenSim.Region.Environment.Scenes else return null; } - + /// /// Get a named prim contained in this scene (will return the first /// found, if there are more than one prim with the same name) @@ -872,13 +872,13 @@ namespace OpenSim.Region.Environment.Scenes { if (ent is SceneObjectGroup) { - foreach(SceneObjectPart p in ((SceneObjectGroup) ent).GetParts()) - { - if (p.Name==name) - { - return p; - } - } + foreach (SceneObjectPart p in ((SceneObjectGroup) ent).GetParts()) + { + if (p.Name==name) + { + return p; + } + } } } return null; diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 2285b0432e..729572aa1e 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -2292,7 +2292,7 @@ namespace OpenSim.Region.Environment.Scenes public void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient) { SceneObjectPart part = GetSceneObjectPart(itemID); - if(part == null || part.ParentGroup == null) + if (part == null || part.ParentGroup == null) return; UUID inventoryID = part.ParentGroup.GetFromAssetID(); @@ -2300,7 +2300,7 @@ namespace OpenSim.Region.Environment.Scenes ScenePresence presence; if (TryGetAvatar(remoteClient.AgentId, out presence)) { - if(!ExternalChecks.ExternalChecksCanRezObject(part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition)) + if (!ExternalChecks.ExternalChecksCanRezObject(part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition)) return; presence.Appearance.DetachAttachment(itemID); diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 7b9183ab8c..342742dd5c 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -3896,7 +3896,7 @@ namespace OpenSim.Region.Environment.Scenes // } // } - /// + /// /// Get a named prim contained in this scene (will return the first /// found, if there are more than one prim with the same name) /// diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 9e605c195c..08623aa477 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -2759,7 +2759,7 @@ namespace OpenSim.Region.Environment.Scenes public void SetAttachmentPoint(byte point) { - lock(m_parts) + lock (m_parts) { foreach (SceneObjectPart part in m_parts.Values) part.SetAttachmentPoint(point); diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs index f568dc58eb..1acb1b5cee 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs @@ -202,9 +202,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine } catch (Exception e) { - if (lastScriptEngine != null) - lastScriptEngine.Log.WarnFormat("[{0}]: Exception {1} thrown",ScriptEngineName,e.GetType().ToString()); - throw e; + if (lastScriptEngine != null) + lastScriptEngine.Log.WarnFormat("[{0}]: Exception {1} thrown", ScriptEngineName, e.GetType().ToString()); + throw e; } } } @@ -216,7 +216,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine public void DoProcessQueue() { foreach (ScriptEngine m_ScriptEngine in - new ArrayList(ScriptEngine.ScriptEngines)) + new ArrayList(ScriptEngine.ScriptEngines)) { lastScriptEngine = m_ScriptEngine; @@ -290,21 +290,21 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine InExecution = false; } } - catch (SelfDeleteException sde) - { - // Make sure this exception isn't consumed here... we need it - throw sde; - } - catch (TargetInvocationException tie) - { - // Probably don't need to special case this one - throw tie; - } + catch (SelfDeleteException sde) + { + // Make sure this exception isn't consumed here... we need it + throw sde; + } + catch (TargetInvocationException tie) + { + // Probably don't need to special case this one + throw tie; + } catch (Exception e) { - InExecution = false; - string text = FormatException(e, QIS.LineMap); - + InExecution = false; + string text = FormatException(e, QIS.LineMap); + // DISPLAY ERROR INWORLD // if (e.InnerException != null) @@ -340,7 +340,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine catch (Exception) { m_ScriptEngine.m_EventQueueManager. - m_ScriptEngine.Log.Error("[" + + m_ScriptEngine.Log.Error("[" + ScriptEngineName + "]: " + "Unable to send text in-world:\r\n" + text); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 655d85c030..fffc331a1e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -4699,7 +4699,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (cindex > 0) { ret.Add(str.Substring(0, cindex)); - } + } // Cannot use spacers.Contains() because spacers may be either type String or LSLString for (int j = 0; j < spacers.Length; j++) { diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index bfe289c225..ee95342cd7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -710,18 +710,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return String.Empty; } } - - public string osGetSimulatorVersion() - { + + public string osGetSimulatorVersion() + { // High because it can be used to target attacks to known weaknesses // This would allow a new class of griefer scripts that don't even // require their user to know what they are doing (see script // kiddie) // - CheckThreatLevel(ThreatLevel.High,"osGetSimulatorVersion"); - m_host.AddScriptLPS(1); - return m_ScriptEngine.World.GetSimulatorVersion(); - } + CheckThreatLevel(ThreatLevel.High,"osGetSimulatorVersion"); + m_host.AddScriptLPS(1); + return m_ScriptEngine.World.GetSimulatorVersion(); + } //for testing purposes only diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 48eddd2cba..92b77a4f72 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs @@ -85,7 +85,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces void osSetRegionWaterHeight(double height); string osGetScriptEngineName(); - string osGetSimulatorVersion(); + string osGetSimulatorVersion(); void osSetParcelMediaTime(double time); Hashtable osParseJSON(string JSON); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs index 5c1c57ae27..90598c16fd 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs @@ -191,19 +191,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase //Console.WriteLine("ScriptEngine: Executing function name: " + EventName); #endif // Found - try - { - ev.Invoke(m_Script, args); - } - catch (TargetInvocationException tie) - { - // Grab the inner exception and rethrow it - throw tie.InnerException; - } - catch (Exception e) - { - throw e; - } + try + { + ev.Invoke(m_Script, args); + } + catch (TargetInvocationException tie) + { + // Grab the inner exception and rethrow it + throw tie.InnerException; + } + catch (Exception e) + { + throw e; + } } protected void initEventFlags() diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index f3ca326c73..d92ae7fe42 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs @@ -214,11 +214,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { return m_OSSL_Functions.osGetScriptEngineName(); } - - public string osGetSimulatorVersion() - { - return m_OSSL_Functions.osGetSimulatorVersion(); - } + + public string osGetSimulatorVersion() + { + return m_OSSL_Functions.osGetSimulatorVersion(); + } //for testing purposes only