diff options
author | Justin Clarke Casey | 2008-11-17 16:06:50 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-17 16:06:50 +0000 |
commit | c41903077d2429f2360fe94a6f33ca647addec6b (patch) | |
tree | dbe48090ec2da8e333f64326543379f2830904db /OpenSim/Region/ScriptEngine/Shared | |
parent | * minor: eliminate propogation of now unused permissionToDelete flag (diff) | |
download | opensim-SC-c41903077d2429f2360fe94a6f33ca647addec6b.zip opensim-SC-c41903077d2429f2360fe94a6f33ca647addec6b.tar.gz opensim-SC-c41903077d2429f2360fe94a6f33ca647addec6b.tar.bz2 opensim-SC-c41903077d2429f2360fe94a6f33ca647addec6b.tar.xz |
* Eliminate SOG.FakeDeleteGroup() since it is now identical with DeleteGroup() (except that is didn't lock the parts, which was a potential race condition)
* Removed fake delete code from LSL_Api.SetFlexi - this code was never activiated anyway and didn't appear to make much sense on the surface
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index f8e9e96..40629c6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -1425,13 +1425,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1425 | if (part == null) | 1425 | if (part == null) |
1426 | return; | 1426 | return; |
1427 | 1427 | ||
1428 | bool needs_fakedelete = false; | ||
1429 | if (flexi) | 1428 | if (flexi) |
1430 | { | 1429 | { |
1431 | if (!part.Shape.FlexiEntry) | ||
1432 | { | ||
1433 | needs_fakedelete = true; | ||
1434 | } | ||
1435 | part.Shape.FlexiEntry = true; // this setting flexi true isn't working, but the below parameters do | 1430 | part.Shape.FlexiEntry = true; // this setting flexi true isn't working, but the below parameters do |
1436 | // work once the prim is already flexi | 1431 | // work once the prim is already flexi |
1437 | part.Shape.FlexiSoftness = softness; | 1432 | part.Shape.FlexiSoftness = softness; |
@@ -1445,23 +1440,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1445 | part.Shape.PathCurve = 0x80; | 1440 | part.Shape.PathCurve = 0x80; |
1446 | 1441 | ||
1447 | } | 1442 | } |
1448 | else | ||
1449 | { | ||
1450 | if (part.Shape.FlexiEntry) | ||
1451 | { | ||
1452 | needs_fakedelete = true; | ||
1453 | } | ||
1454 | part.Shape.FlexiEntry = false; | ||
1455 | } | ||
1456 | |||
1457 | needs_fakedelete = false; | ||
1458 | if (needs_fakedelete) | ||
1459 | { | ||
1460 | if (part.ParentGroup != null) | ||
1461 | { | ||
1462 | part.ParentGroup.FakeDeleteGroup(); | ||
1463 | } | ||
1464 | } | ||
1465 | 1443 | ||
1466 | part.ParentGroup.HasGroupChanged = true; | 1444 | part.ParentGroup.HasGroupChanged = true; |
1467 | part.ScheduleFullUpdate(); | 1445 | part.ScheduleFullUpdate(); |