diff options
author | Melanie | 2011-11-04 01:18:37 +0000 |
---|---|---|
committer | Melanie | 2011-11-04 01:18:37 +0000 |
commit | 24235006f473cec56213705ce70df781cf9bcbc1 (patch) | |
tree | 7d0e75978d48272827c3f03f087bf79658dd16cf /OpenSim/Region/ScriptEngine/Shared/Api | |
parent | Merge branch 'master' into bigmerge (diff) | |
parent | Rename ForEachAvatar back to ForEachScenePresence. The other changes (diff) | |
download | opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.zip opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.tar.gz opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.tar.bz2 opensim-SC_OLD-24235006f473cec56213705ce70df781cf9bcbc1.tar.xz |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 45a5f9a..ff91cfa 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -1827,7 +1827,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1827 | if (flexi) | 1827 | if (flexi) |
1828 | { | 1828 | { |
1829 | part.Shape.FlexiEntry = true; // this setting flexi true isn't working, but the below parameters do | 1829 | part.Shape.FlexiEntry = true; // this setting flexi true isn't working, but the below parameters do |
1830 | // work once the prim is already flexi | 1830 | // work once the prim is already flexi |
1831 | part.Shape.FlexiSoftness = softness; | 1831 | part.Shape.FlexiSoftness = softness; |
1832 | part.Shape.FlexiGravity = gravity; | 1832 | part.Shape.FlexiGravity = gravity; |
1833 | part.Shape.FlexiDrag = friction; | 1833 | part.Shape.FlexiDrag = friction; |
@@ -1837,10 +1837,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1837 | part.Shape.FlexiForceY = (float)Force.y; | 1837 | part.Shape.FlexiForceY = (float)Force.y; |
1838 | part.Shape.FlexiForceZ = (float)Force.z; | 1838 | part.Shape.FlexiForceZ = (float)Force.z; |
1839 | part.Shape.PathCurve = 0x80; | 1839 | part.Shape.PathCurve = 0x80; |
1840 | part.ParentGroup.HasGroupChanged = true; | ||
1841 | part.ScheduleFullUpdate(); | ||
1840 | } | 1842 | } |
1841 | |||
1842 | part.ParentGroup.HasGroupChanged = true; | ||
1843 | part.ScheduleFullUpdate(); | ||
1844 | } | 1843 | } |
1845 | 1844 | ||
1846 | /// <summary> | 1845 | /// <summary> |
@@ -11199,7 +11198,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
11199 | 11198 | ||
11200 | if (checkAgents) | 11199 | if (checkAgents) |
11201 | { | 11200 | { |
11202 | World.ForEachScenePresence(delegate(ScenePresence sp) | 11201 | World.ForEachRootScenePresence(delegate(ScenePresence sp) |
11203 | { | 11202 | { |
11204 | if (sp.AbsolutePosition.ApproxEquals(posToCheck, sp.PhysicsActor.Size.X)) | 11203 | if (sp.AbsolutePosition.ApproxEquals(posToCheck, sp.PhysicsActor.Size.X)) |
11205 | { | 11204 | { |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index 6de0773..ed5a2fe 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||
@@ -510,7 +510,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
510 | senseEntity(sp); | 510 | senseEntity(sp); |
511 | if ((ts.type & AGENT_BY_USERNAME) != 0) | 511 | if ((ts.type & AGENT_BY_USERNAME) != 0) |
512 | { | 512 | { |
513 | m_CmdManager.m_ScriptEngine.World.ForEachScenePresence( | 513 | m_CmdManager.m_ScriptEngine.World.ForEachRootScenePresence( |
514 | delegate (ScenePresence ssp) | 514 | delegate (ScenePresence ssp) |
515 | { | 515 | { |
516 | if (ssp.Lastname == "Resident") | 516 | if (ssp.Lastname == "Resident") |
@@ -529,7 +529,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
529 | } | 529 | } |
530 | else | 530 | else |
531 | { | 531 | { |
532 | m_CmdManager.m_ScriptEngine.World.ForEachScenePresence(senseEntity); | 532 | m_CmdManager.m_ScriptEngine.World.ForEachRootScenePresence(senseEntity); |
533 | } | 533 | } |
534 | return sensedEntities; | 534 | return sensedEntities; |
535 | } | 535 | } |