diff options
author | Jeff Ames | 2009-11-23 11:26:06 +0900 |
---|---|---|
committer | Jeff Ames | 2009-11-23 11:26:06 +0900 |
commit | 9f5c2acd128828d220bf7e47bd4fe13d7a2a910b (patch) | |
tree | bb1a273746c4b2a466dd705537a2457f0474faa2 /OpenSim/Region/ScriptEngine | |
parent | * Added missing lock to m_forcelist when AddForce is called. When a user dr... (diff) | |
download | opensim-SC-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.zip opensim-SC-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.gz opensim-SC-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.bz2 opensim-SC-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 24 |
2 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 8eebf02..9c62775 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -1271,11 +1271,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1271 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | 1271 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) |
1272 | return; | 1272 | return; |
1273 | if (scale.x < 0.01) | 1273 | if (scale.x < 0.01) |
1274 | scale.x = 0.01; | 1274 | scale.x = 0.01; |
1275 | if (scale.y < 0.01) | 1275 | if (scale.y < 0.01) |
1276 | scale.y = 0.01; | 1276 | scale.y = 0.01; |
1277 | if (scale.z < 0.01) | 1277 | if (scale.z < 0.01) |
1278 | scale.z = 0.01; | 1278 | scale.z = 0.01; |
1279 | 1279 | ||
1280 | if (part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical) | 1280 | if (part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical) |
1281 | { | 1281 | { |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 549c038..41b5d49 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -252,18 +252,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
252 | { | 252 | { |
253 | m_Apis[api] = am.CreateApi(api); | 253 | m_Apis[api] = am.CreateApi(api); |
254 | m_Apis[api].Initialize(engine, part, m_LocalID, itemID); | 254 | m_Apis[api].Initialize(engine, part, m_LocalID, itemID); |
255 | } | 255 | } |
256 | 256 | ||
257 | try | 257 | try |
258 | { | 258 | { |
259 | if (dom != System.AppDomain.CurrentDomain) | 259 | if (dom != System.AppDomain.CurrentDomain) |
260 | m_Script = (IScript)dom.CreateInstanceAndUnwrap( | 260 | m_Script = (IScript)dom.CreateInstanceAndUnwrap( |
261 | Path.GetFileNameWithoutExtension(assembly), | 261 | Path.GetFileNameWithoutExtension(assembly), |
262 | "SecondLife.Script"); | 262 | "SecondLife.Script"); |
263 | else | 263 | else |
264 | m_Script = (IScript)Assembly.Load( | 264 | m_Script = (IScript)Assembly.Load( |
265 | Path.GetFileNameWithoutExtension(assembly)).CreateInstance( | 265 | Path.GetFileNameWithoutExtension(assembly)).CreateInstance( |
266 | "SecondLife.Script"); | 266 | "SecondLife.Script"); |
267 | 267 | ||
268 | 268 | ||
269 | //ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); | 269 | //ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass); |
@@ -903,7 +903,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
903 | // If the state is different, update the disk file. | 903 | // If the state is different, update the disk file. |
904 | UUID hash = UUID.Parse(Utils.MD5String(xml)); | 904 | UUID hash = UUID.Parse(Utils.MD5String(xml)); |
905 | 905 | ||
906 | if(hash != m_CurrentStateHash) | 906 | if (hash != m_CurrentStateHash) |
907 | { | 907 | { |
908 | try | 908 | try |
909 | { | 909 | { |