From bc6ec3b56469f2d722ceee8fdb37059125878f66 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sun, 9 Aug 2009 00:43:13 +0900 Subject: Formatting cleanup. --- OpenSim/Data/SQLite/SQLiteRegionData.cs | 2 +- OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 +- .../Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs | 4 ++-- .../Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs | 2 +- .../Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | 4 ++-- .../Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | 2 +- .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 ++-- .../Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 10 +++++----- OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 4 ++-- OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 6 +++--- 10 files changed, 20 insertions(+), 20 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 3555caf..d2548c2 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs @@ -1443,7 +1443,7 @@ namespace OpenSim.Data.SQLite // row["RegionUUID"] = regionUUID; // row["Revision"] = rev; - // MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize )*sizeof (double)); + // MemoryStream str = new MemoryStream(((int)Constants.RegionSize * (int)Constants.RegionSize)*sizeof (double)); // BinaryWriter bw = new BinaryWriter(str); // // TODO: COMPATIBILITY - Add byte-order conversions diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 582f44d..76bcd7e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs @@ -927,7 +927,7 @@ namespace OpenSim.Region.Framework.Scenes { foreach (IScriptModule e in engines) { - if(!e.CanBeDeleted(item.ItemID)) + if (!e.CanBeDeleted(item.ItemID)) return false; } } diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs index b1f93e9..9ba09ed 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs @@ -53,8 +53,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice string requestcontext = (string) request["Hunt-Context"]; response["content_type"] = "text/xml"; response["keepalive"] = false; - response["int_response_code"] = 200; - if ( Context != String.Empty && Context != requestcontext) + response["int_response_code"] = 200; + if (Context != String.Empty && Context != requestcontext) { m_log.Debug("[FreeSwitchDirectory] returning empty as it's for another context"); response["str_response_string"] = ""; diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs index 8afaeea..5d90a8f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDirectory.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice { Hashtable response = new Hashtable(); string domain = (string) request["domain"]; - if ( domain != Realm) { + if (domain != Realm) { response["content_type"] = "text/xml"; response["keepalive"] = false; response["int_response_code"] = 200; diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs index d77fe5b..115660a 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs @@ -95,8 +95,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups { // if groups aren't enabled, we're not needed. // if we're not specified as the connector to use, then we're not wanted - if ( (groupsConfig.GetBoolean("Enabled", false) == false) - || (groupsConfig.GetString("ServicesConnectorModule", "Default") != Name)) + if ((groupsConfig.GetBoolean("Enabled", false) == false) + || (groupsConfig.GetString("ServicesConnectorModule", "Default") != Name)) { m_connectorEnabled = false; return; diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs index 6a15a33..5ed9af3 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs @@ -93,7 +93,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule void EventManager_OnStopScript(uint localID, UUID itemID) { - if(m_scripts.ContainsKey(itemID)) + if (m_scripts.ContainsKey(itemID)) { m_scripts[itemID].Stop(); } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index b855a1a..ff85b96 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -7246,10 +7246,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api public LSL_List llGetPrimitiveParams(LSL_List rules) { m_host.AddScriptLPS(1); - return GetLinkPrimitiveParams( m_host, rules ); + return GetLinkPrimitiveParams(m_host, rules); } - public LSL_List GetLinkPrimitiveParams( SceneObjectPart part, LSL_List rules ) + public LSL_List GetLinkPrimitiveParams(SceneObjectPart part, LSL_List rules) { LSL_List res = new LSL_List(); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index cbe84ac..6539bda 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -1748,16 +1748,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // to an unscrupulous third party, thus permitting unauthorized duplication of // the object's form. // - public LSL_List osGetLinkPrimitiveParams( int linknumber, LSL_List rules ) + public LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules) { - CheckThreatLevel( ThreatLevel.High, "osGetLinkPrimitiveParams" ); - m_host.AddScriptLPS( 1 ); + CheckThreatLevel(ThreatLevel.High, "osGetLinkPrimitiveParams"); + m_host.AddScriptLPS(1); InitLSL(); LSL_List retVal = new LSL_List(); - List parts = ((LSL_Api)m_LSL_Api).GetLinkParts( linknumber ); + List parts = ((LSL_Api)m_LSL_Api).GetLinkParts(linknumber); foreach (SceneObjectPart part in parts) { - retVal += ((LSL_Api)m_LSL_Api).GetLinkPrimitiveParams( part, rules ); + retVal += ((LSL_Api)m_LSL_Api).GetLinkPrimitiveParams(part, rules); } return retVal; } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 23e03e2..0be29f2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs @@ -146,8 +146,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces string osLoadedCreationDate(); string osLoadedCreationTime(); string osLoadedCreationID(); - - LSL_List osGetLinkPrimitiveParams( int linknumber, LSL_List rules ); + + LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules); } } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 22c8887..abdba05 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs @@ -387,10 +387,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { return m_OSSL_Functions.osLoadedCreationID(); } - - public LSL_List osGetLinkPrimitiveParams( int linknumber, LSL_List rules ) + + public LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules) { - return m_OSSL_Functions.osGetLinkPrimitiveParams( linknumber, rules ); + return m_OSSL_Functions.osGetLinkPrimitiveParams(linknumber, rules); } -- cgit v1.1