aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-193-4/+96
|\ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
| * New constants for llGetObjectDetailsTalun2013-01-192-0/+92
| | | | | | | | | | | | | | New constants for llGetObjectDetails OBJECT_CHARACTER_TIME, OBJECT_ROOT, OBJECT_ATTACHED_POINT, OBJECT_PATHFINDING_TYPE, OBJECT_PHYSICS, OBJECT_PHANTOM and OBJECT_TEMP_ON_REZ also Pathfining constants, 3 of which are used by llGetObjectDetails
| * Mantis 6507 keys returned by llGetAgentList incorrect for llList2KeyTalun2013-01-191-2/+2
| | | | | | | | The type of the keys returned by llGetAgentList corrected to LSL_Key
| * Restore previous client AO behaviour by not allowing them to remove the ↵Justin Clark-Casey (justincc)2013-01-182-2/+2
| | | | | | | | | | | | | | | | | | default animation but continue to allow scripts to do so. This keeps the fix from http://opensimulator.org/mantis/view.php?id=6327 and fixes the behaviour regression in http://opensimulator.org/mantis/view.php?id=6483 Animations may still exhibit different behaviour if both scripts and clients are adjusting animations. A change in the behaviour of client AO to not remove all animations may be a better long term approach.
* | Merge branch 'master' into careminsterMelanie2013-01-161-0/+157
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
| * Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-1614-49/+291
| | | | | | | | | | | | | | | | | | | | script wait event (llSleep(), etc.) This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability. If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread. This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period. Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented. This commit, unlike 1b5c41c, passes the wait handle as an extra parameter through IScript.Initialize() instead of passing IScriptInstance itself.
| * Revert "Implement co-operative script termination if termination comes ↵Justin Clark-Casey (justincc)2013-01-164-248/+10
| | | | | | | | | | | | | | | | during a script wait event (llSleep(), etc.)" Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api. This reverts commit 1b5c41c14ad11325be249ea1cce3c65d4d6a89be.
| * Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-164-10/+248
| | | | | | | | | | | | | | | | | | script wait event (llSleep(), etc.) This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability. If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread. This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period. Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented.
| * Instead of passing separate engine, part and item components to script APIs, ↵Justin Clark-Casey (justincc)2013-01-1512-68/+88
| | | | | | | | | | | | | | | | pass down IScriptInstance instead. This is to allow the future co-operative script thread terminate feature to detect and act upon termination requests. This splits the assembly and state loading out from the ScriptInstance() constructor to a separate Load() method in order to facilititate continued script logic regression testing.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-153-11/+54
| |\
| * | refactor: Simplify ScriptInstance by retaining reference to SceneObjectPart ↵Justin Clark-Casey (justincc)2013-01-141-72/+55
| | | | | | | | | | | | instead of sometimes but not always looking it up.
* | | Merge branch 'avination' into careminsterMelanie2013-01-161-5/+9
|\ \ \
| * | | Fix llSetRegionPos and detail behaviors of llSet[Link]PrimitiveParams[Fast]()Melanie2013-01-151-5/+9
| | | | | | | | | | | | | | | | regarding prim positioning.
* | | | JustinCC's core re-mergeMelanie2013-01-1614-77/+177
| | | |
* | | | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-163-11/+54
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | | BulletSim: add osGetPhysicsEngineType() LSL function and updateRobert Adams2013-01-113-11/+54
| | |/ | |/| | | | | | | | | | | | | | | | | | | the physics engines to return the name that is specified in the INI file ("physics = XXX") as the type of engine. This os function is a little different than the others in that it does not throw an exception of one is not privilaged to use it. It merely returns an empty string.
* | | Merge branch 'avination' into careminsterMelanie2013-01-131-1/+3
|\ \ \ | | |/ | |/|
| * | make sure keyframe rotations are normalizedUbitUmarov2013-01-111-1/+3
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-102-49/+85
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Add "show script timers" command to show script timers. For debug purposes.Justin Clark-Casey (justincc)2013-01-102-32/+38
| | | | | | | | | | | | Also, "show sensors" changes to "show script sensors".
| * | Add "show sensors" command to show script sensor information for debug purposes.Justin Clark-Casey (justincc)2013-01-101-32/+62
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-01-101-4/+38
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | fix llGetRot and parameters prim_rotation for attachments. Only onUbitUmarov2013-01-091-1/+27
| | | | | | | | | | | | LSL_api to avoid side effects for now
| * | stop endless loop in lGetLinkPrimitiveParamsUbitUmarov2013-01-091-0/+2
| | |
| * | Prevent a null ref in llGetLinkPrimiteveParams. Still not a fix for the realMelanie2013-01-091-1/+1
| | | | | | | | | | | | issue.
| * | * ubit pointed out another place where that check needed to be updated and I ↵teravus2013-01-011-6/+3
| | | | | | | | | | | | normalized it.
| * | * This is actually the fix described the last commit.. I had commented it ↵teravus2013-01-011-1/+1
| | | | | | | | | | | | out to see if the problem had affected all attachments or just HUD attachments.
| * | * Fixes the attachment scripted rotation bug. The problem is the code was ↵teravus2013-01-011-2/+11
| | | | | | | | | | | | relying on m_host.ParentId = 0 to determine if the attachment should be rotated against root prim offset. To fix it for attachments, we also need to check if the host's localID == RootPart's localID. otherwise we are cumulatively rotating against the host's root part rotation offset (which in this case, is it's own rotation)
* | | Merge branch 'master' into careminsterMelanie2013-01-043-76/+85
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Set default particle burst count to 1 instead of 0 in any set particle ↵Justin Clark-Casey (justincc)2013-01-041-3/+3
| | | | | | | | | | | | | | | | | | system script call that does not have an empty list. As per http://opensimulator.org/mantis/view.php?id=6353
| * | Fix build break caused by missing ) from dce2809.Justin Clark-Casey (justincc)2013-01-041-1/+1
| | | | | | | | | | | | Was hand-typing in a line of code I had tested before but not retested this time
| * | Automatically grant sit-related llRequestPermissions() for subsequent ↵Justin Clark-Casey (justincc)2013-01-041-15/+1
| | | | | | | | | | | | | | | | | | avatars sitting on the same scene obejct, instead of wrongly popping up request permissions dialog. Resolves http://opensimulator.org/mantis/view.php?id=6478
| * | refactor: simplify llGetNumberOfPrims() to return prim count + sitting ↵Justin Clark-Casey (justincc)2013-01-041-7/+1
| | | | | | | | | | | | avatar count rather than independently inspecting every scene presence
| * | Fix llGetLinkName() to return the name of the last avatar sat as the last ↵Justin Clark-Casey (justincc)2013-01-041-41/+35
| | | | | | | | | | | | | | | | | | link number. As per http://wiki.secondlife.com/wiki/LlGetLinkName
| * | Fix llGetLinkKey() to return the last sat avatar as the last link number.Justin Clark-Casey (justincc)2013-01-041-17/+31
| | | | | | | | | | | | | | | | | | | | | | | | As per http://wiki.secondlife.com/wiki/LlGetLinkKey This is done by keeping a scene-object wide list of sitters. This also fixes bugs in this function where linknums 0 and 1 weren't treated properly if there were sitting avatars on a single prim. This also fixes a minor race condition for multiple concurrent sitters on a prim with no current sitters by locking on the object-wide list rather than individual sop lists Addresses http://opensimulator.org/mantis/view.php?id=6477
| * | Scipt modules get the OpenMetaverse types, so lists passed as arguments to ↵SignpostMarv2013-01-031-2/+27
| | | | | | | | | | | | script module functions which then later call LSL_Types.list.GetVector3Item() or LSL_Types.list.GetQuaternionItem() methods would then trigger an InvalidCastException, which is now avoided.
| * | Improving documentation of AttachToAvatar and GetLine methods in LSL_Api.cs ↵SignpostMarv2013-01-031-8/+15
| | | | | | | | | | | | based on doxygen error output
| * | Fixed several problems with the Sun: some settings didn't work, or were ↵Oren Hurvitz2013-01-021-6/+4
| | | | | | | | | | | | inconsistently used. - The sun position is always calculated by combining the sun settings in the Region and Estate. This fixes the problem that 'UseEstateSun' didn't work. - To remove ambiguity, the EstateToolsSunUpdate event no longer accepts the sun's position as parameters. That's because the position is always calculated from the Region and Estate settings. - Use only the 'FixedSun' flag to determine whether the sun is fixed; not the 'UseGlobalTime' flag. - Don't change the region's 'SunPosition' field according to the sun's position: this field is used only to set the position when using a FixedSun. (The 'SunVector' field does get updated according to the sun's position in the sky)
| * | If an NPC is unowned, then always auto-grant permissions requested via ↵Justin Clark-Casey (justincc)2013-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | llRequestPermissions() This is consistent with all other OSSL NPC functions that allow unowned avatars to be manipulated. Aims to address http://opensimulator.org/mantis/view.php?id=6483
* | | Merge branch 'master' into careminsterMelanie2013-01-021-2/+11
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Resolve Mantis 6480 (http://opensimulator.org/mantis/view.php?id=6480)Robert Adams2012-12-311-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | by reversing the sign on the recoil computation and adding a [XEngine]RecoilScaleFactor parameter which defaults to zero. Testing in SL seems to show that there is not a recoil action there. Or, at least, it is very small. If someone knows how small, the default for the scale factor should be changed.
* | | Merge branch 'master' into careminsterMelanie2012-12-211-3/+4
|\ \ \ | |/ /
| * | Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. ↵Robert Adams2012-12-181-3/+4
| | | | | | | | | | | | Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags.
* | | Merge branch 'avination' into careminsterMelanie2012-12-182-6/+30
|\ \ \ | | |/ | |/|
| * | fix regressionUbitUmarov2012-12-071-2/+2
| | |
| * | *TEST* add some avatar skeleton information and use it to calculate avatarUbitUmarov2012-12-071-4/+25
| | | | | | | | | | | | height and bounding box. Change LSL acording.
| * | Merge branch 'avination' into ubitworkMelanie2012-12-031-2/+2
| |\ \
| | * | Add a transaction ID to the money module path for llTransferLindenDollarsMelanie2012-12-031-2/+2
| | | |
| * | | avoid potencial NullReferenceExceptionUbitUmarov2012-11-241-2/+5
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-12-181-2/+2
|\ \ \ | | |/ | |/|
generated by cgit v1.1 at 2024-12-18 19:32:25 +0000