diff options
author | Jeff Ames | 2008-12-11 02:35:51 +0000 |
---|---|---|
committer | Jeff Ames | 2008-12-11 02:35:51 +0000 |
commit | a8fff196f57f59263ffb1bab7e64d4aea3312232 (patch) | |
tree | b088515c8949f90d70c395c681a63cdc786f5b05 /OpenSim | |
parent | Make object return actually use the CanReturnObject permission, rather than (diff) | |
download | opensim-SC-a8fff196f57f59263ffb1bab7e64d4aea3312232.zip opensim-SC-a8fff196f57f59263ffb1bab7e64d4aea3312232.tar.gz opensim-SC-a8fff196f57f59263ffb1bab7e64d4aea3312232.tar.bz2 opensim-SC-a8fff196f57f59263ffb1bab7e64d4aea3312232.tar.xz |
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 34 |
2 files changed, 18 insertions, 18 deletions
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 | |||
757 | { | 757 | { |
758 | String direction = (String)args[0]; | 758 | String direction = (String)args[0]; |
759 | 759 | ||
760 | if( direction.ToLower().StartsWith("y")) | 760 | if (direction.ToLower().StartsWith("y")) |
761 | { | 761 | { |
762 | for (int x = 0; x < Constants.RegionSize; x++) | 762 | for (int x = 0; x < Constants.RegionSize; x++) |
763 | { | 763 | { |
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 | |||
78 | 78 | ||
79 | private DateTime m_timer = DateTime.Now; | 79 | private DateTime m_timer = DateTime.Now; |
80 | private bool m_waitingForScriptAnswer=false; | 80 | private bool m_waitingForScriptAnswer=false; |
81 | private bool m_automaticLinkPermission=false; | 81 | private bool m_automaticLinkPermission=false; |
82 | 82 | ||
83 | //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 83 | //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
84 | 84 | ||
@@ -90,13 +90,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
90 | m_itemID = itemID; | 90 | m_itemID = itemID; |
91 | 91 | ||
92 | m_ScriptDelayFactor = | 92 | m_ScriptDelayFactor = |
93 | m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); | 93 | m_ScriptEngine.Config.GetFloat("ScriptDelayFactor", 1.0f); |
94 | m_ScriptDistanceFactor = | 94 | m_ScriptDistanceFactor = |
95 | m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f); | 95 | m_ScriptEngine.Config.GetFloat("ScriptDistanceLimitFactor", 1.0f); |
96 | m_MinTimerInterval = | 96 | m_MinTimerInterval = |
97 | m_ScriptEngine.Config.GetFloat("MinTimerInterval", 0.5f); | 97 | m_ScriptEngine.Config.GetFloat("MinTimerInterval", 0.5f); |
98 | m_automaticLinkPermission = | 98 | m_automaticLinkPermission = |
99 | m_ScriptEngine.Config.GetBoolean("AutomaticLinkPermission", false); | 99 | m_ScriptEngine.Config.GetBoolean("AutomaticLinkPermission", false); |
100 | 100 | ||
101 | AsyncCommands = new AsyncCommandManager(ScriptEngine); | 101 | AsyncCommands = new AsyncCommandManager(ScriptEngine); |
102 | } | 102 | } |
@@ -3024,9 +3024,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3024 | { | 3024 | { |
3025 | if (item.Type == 10 && item.ItemID == m_itemID) | 3025 | if (item.Type == 10 && item.ItemID == m_itemID) |
3026 | { | 3026 | { |
3027 | int perms = item.PermsMask; | 3027 | int perms = item.PermsMask; |
3028 | if (m_automaticLinkPermission) | 3028 | if (m_automaticLinkPermission) |
3029 | perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; | 3029 | perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; |
3030 | return perms; | 3030 | return perms; |
3031 | } | 3031 | } |
3032 | } | 3032 | } |
@@ -3061,12 +3061,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3061 | m_host.AddScriptLPS(1); | 3061 | m_host.AddScriptLPS(1); |
3062 | UUID invItemID = InventorySelf(); | 3062 | UUID invItemID = InventorySelf(); |
3063 | if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 | 3063 | if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 |
3064 | && !m_automaticLinkPermission) | 3064 | && !m_automaticLinkPermission) |
3065 | { | 3065 | { |
3066 | ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); | 3066 | ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); |
3067 | return; | 3067 | return; |
3068 | } | 3068 | } |
3069 | 3069 | ||
3070 | IClientAPI client = null; | 3070 | IClientAPI client = null; |
3071 | ScenePresence sp = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter); | 3071 | ScenePresence sp = World.GetScenePresence(m_host.TaskInventory[invItemID].PermsGranter); |
3072 | if (sp != null) | 3072 | if (sp != null) |
@@ -3096,8 +3096,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3096 | parentPrim.RootPart.AddFlag(PrimFlags.CreateSelected); | 3096 | parentPrim.RootPart.AddFlag(PrimFlags.CreateSelected); |
3097 | parentPrim.HasGroupChanged = true; | 3097 | parentPrim.HasGroupChanged = true; |
3098 | parentPrim.ScheduleGroupForFullUpdate(); | 3098 | parentPrim.ScheduleGroupForFullUpdate(); |
3099 | if (client!=null) | 3099 | if (client != null) |
3100 | parentPrim.GetProperties(client); | 3100 | parentPrim.GetProperties(client); |
3101 | 3101 | ||
3102 | ScriptSleep(1000); | 3102 | ScriptSleep(1000); |
3103 | } | 3103 | } |
@@ -3107,7 +3107,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3107 | m_host.AddScriptLPS(1); | 3107 | m_host.AddScriptLPS(1); |
3108 | UUID invItemID = InventorySelf(); | 3108 | UUID invItemID = InventorySelf(); |
3109 | if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 | 3109 | if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 |
3110 | && !m_automaticLinkPermission) | 3110 | && !m_automaticLinkPermission) |
3111 | { | 3111 | { |
3112 | ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); | 3112 | ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); |
3113 | return; | 3113 | return; |