From a8fff196f57f59263ffb1bab7e64d4aea3312232 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 11 Dec 2008 02:35:51 +0000 Subject: Update svn properties, minor formatting cleanup. --- .../Modules/World/Terrain/TerrainModule.cs | 2 +- .../Shared/Api/Implementation/LSL_Api.cs | 34 +++++++++++----------- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs index c1d6ab2..e1dcd4c 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs @@ -757,7 +757,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain { String direction = (String)args[0]; - if( direction.ToLower().StartsWith("y")) + if (direction.ToLower().StartsWith("y")) { for (int x = 0; x < Constants.RegionSize; x++) { diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 1189e86..68b92a4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -78,7 +78,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api private DateTime m_timer = DateTime.Now; private bool m_waitingForScriptAnswer=false; - private bool m_automaticLinkPermission=false; + private bool m_automaticLinkPermission=false; //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); @@ -90,13 +90,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_itemID = itemID; m_ScriptDelayFactor = - m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); + m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); m_ScriptDistanceFactor = - m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f); + m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f); m_MinTimerInterval = - m_ScriptEngine.Config.GetFloat("MinTimerInterval", 0.5f); - m_automaticLinkPermission = - m_ScriptEngine.Config.GetBoolean("AutomaticLinkPermission", false); + m_ScriptEngine.Config.GetFloat("MinTimerInterval", 0.5f); + m_automaticLinkPermission = + m_ScriptEngine.Config.GetBoolean("AutomaticLinkPermission", false); AsyncCommands = new AsyncCommandManager(ScriptEngine); } @@ -3024,9 +3024,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { if (item.Type == 10 && item.ItemID == m_itemID) { - int perms = item.PermsMask; - if (m_automaticLinkPermission) - perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; + int perms = item.PermsMask; + if (m_automaticLinkPermission) + perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; return perms; } } @@ -3061,12 +3061,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); UUID invItemID = InventorySelf(); if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 - && !m_automaticLinkPermission) - { - ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); - return; + && !m_automaticLinkPermission) + { + ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); + return; } - + IClientAPI client = null; ScenePresence sp = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter); if (sp != null) @@ -3096,8 +3096,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api parentPrim.RootPart.AddFlag(PrimFlags.CreateSelected); parentPrim.HasGroupChanged = true; parentPrim.ScheduleGroupForFullUpdate(); - if (client!=null) - parentPrim.GetProperties(client); + if (client != null) + parentPrim.GetProperties(client); ScriptSleep(1000); } @@ -3107,7 +3107,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api m_host.AddScriptLPS(1); UUID invItemID = InventorySelf(); if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 - && !m_automaticLinkPermission) + && !m_automaticLinkPermission) { ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); return; -- cgit v1.1