aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-02-071-7/+9
|\
| * Rename Bounciness to RestitutionMelanie2013-02-071-2/+2
| |
| * Make scripts shout a error but not stop when button count is overrun on llDialogMelanie2013-02-051-7/+9
| |
* | Rename Bounciness to RestitutionMelanie2013-02-071-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-02-061-89/+15
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | refactor: Move functions that lookup asset ids from task inventory or pass ↵Justin Clark-Casey (justincc)2013-02-061-89/+15
| | | | | | | | | | | | | | | | | | | | | them through to ScriptUtils class in OpenSim.Region.Framework.dll Renames functions to better reflect what they do. This is so that code registering with modInvoke() can reuse this code to provide functions that behave in a consistent manner with existing LSL/OSSL functions.
* | | Merge branch 'master' into careminsterMelanie2013-02-057-8/+68
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Fix bug where viewers would not see the "Module command functions not ↵Justin Clark-Casey (justincc)2013-02-051-2/+62
| | | | | | | | | | | | | | | | | | enabled" error if these were disabled and a viewer attempted to call one. This was not working because the shouter was wrongly signalled as an agent rather than a prim
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-056-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | | Merge branch 'master' into careminsterMelanie2013-02-041-1/+1
|\ \ \ | |/ /
| * | Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantomJustin Clark-Casey (justincc)2013-02-021-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-312-23/+172
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | Fix issue where lsl -> c# generation in co-operative termination mode did ↵Justin Clark-Casey (justincc)2013-01-302-22/+171
| | | | | | | | | | | | | | | | | | | | | not correctly handle single statement versions of for, while and do-while loops. Add regression tests to validate the fix. This problem will not affect the default abort termination mode.
| * | minor: remove EnableLogging() left over in CoopTerminationTestsJustin Clark-Casey (justincc)2013-01-291-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-261-3/+10
|\ \ \ | |/ /
| * | Mantis 6343: Turn a prim to flexy to OFF don't work llSetPrimParamsTalun2013-01-261-3/+10
| | | | | | | | | | | | Correction so that scripts can turn Flexi off as well as on.
* | | Merge branch 'master' into careminsterMelanie2013-01-252-5/+17
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | * This makes the non-physics llCastRay 'better'. It's not 'correctly ↵teravus2013-01-231-4/+17
| | | | | | | | | | | | working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray.
| * | Remove unnecessary System.Linq reference from Compiler.csJustin Clark-Casey (justincc)2013-01-241-1/+0
| | | | | | | | | | | | Hopefully will fix windows build via compile.bat
* | | Merge branch 'avination' into careminsterMelanie2013-01-243-12/+26
|\ \ \ | | |/ | |/|
| * | Make llGiveMoney async again. The return value is now the constant 1 to makeMelanie2013-01-241-8/+10
| | | | | | | | | | | | | | | scripts work properly. Scripts will no longer receive a failure indication through this return value;
| * | Reintroduce the return value of llGiveMoney. The grid will crash and burn ↵Melanie2013-01-243-12/+12
| | | | | | | | | | | | without it.
| * | Prevent double ground collisions and prefer the physics result if there is one.Melanie2013-01-231-3/+15
| | | | | | | | | | | | | | | ODE is known to not see the ground sometimes on raycast so the double test is needed.
| * | Fix a type (Suports => Supports). Also put the normal terrain collision checkMelanie2013-01-231-8/+8
| | | | | | | | | | | | into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
* | | Merge branch 'master' into careminsterMelanie2013-01-242-2/+7
|\ \ \ | | |/ | |/|
| * | Disable the not very useful infinite recursion co-op termination tests for ↵Justin Clark-Casey (justincc)2013-01-241-2/+6
| | | | | | | | | | | | | | | | | | now as they appear to cause failures with testing in jenkins. These tests are not very useful anyway as they never actually get a chance to try termination before the script runs out of stack
| * | Fix mono 2.4.3 build break by using CreateInstanceAndUnwrap 9 method call ↵Justin Clark-Casey (justincc)2013-01-241-0/+1
| | | | | | | | | | | | deprecated in later .net versions
* | | Merge branch 'master' into careminsterMelanie2013-01-249-114/+465
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Merge branch 'master' into coopterminationJustin Clark-Casey (justincc)2013-01-245-51/+288
| |\ \
| | * | Add the Avination physics raycast glue so Core Physics can implement raycastMelanie2013-01-231-13/+77
| | | |
| | * | Remove the return value from llGiveMoney and add llTransferLindenDollars. AlsoMelanie2013-01-233-33/+114
| | | | | | | | | | | | | | | | | | | | make llGiveMoney async so the script thread is not held up waiting for comms to an external server.
| | * | Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenterRobert Adams2013-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | routines on the physics engine. Won't make a difference for any existing scripts since ODE always returned Vector3.Zero.
| * | | Pass narrower WaitHandle rather than EventWaitHandle as co-op termination ↵Justin Clark-Casey (justincc)2013-01-234-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | wait handle to script APIs. APIs don't need to reference any methods on EventWaitHandle
| * | | Improve logging by making it clearer which script is failing if an assembly ↵Justin Clark-Casey (justincc)2013-01-231-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fails to load. Moves the noise co-op start/stop debug log messages to only display if xengine debug level >= 1 Logs which stop strategy is being used (abort or co-op) Adjusts some other logging to remove not very useful stuff
| * | | If ScriptStopStrategy hasn't been set to co-op in [XEngine] config, then ↵Justin Clark-Casey (justincc)2013-01-233-21/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | continue to generate C# that is functionality identical to historical generation This is to eliminate disruption until co-op termination has been well-tested. In non co-op mode, XEngine will continue to load DLLs of the existing Script class and the new XEngineScript class. Moving to co-op mode still requires existing script DLL deletion to force recompilation, either manually or by setting DeleteScriptsOnStartup = true for one run. This change also means that scripts which fail to initialize do not still show up as running scripts.
| * | | Add co-op termination regression test for infinite recursive manual call on ↵Justin Clark-Casey (justincc)2013-01-221-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | event function. Such code would normally terminate quickly with a stack overflow exception anyway.
| * | | Set script delay factor to 0 in co-op termination testsJustin Clark-Casey (justincc)2013-01-221-0/+3
| | | | | | | | | | | | | | | | | | | | This is to ensure loops aren't actually terminating from a wait on an LSL function. This was not the case with any of the existing tests.
| * | | Add regression test for co-op termination on infinite user function call ↵Justin Clark-Casey (justincc)2013-01-221-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | regression. Such a script would probably run out of stack pretty quickly anyway.
| * | | Add regression test for co-op stop of an infinite jump loopJustin Clark-Casey (justincc)2013-01-221-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes bug in do-while test Improves detection of failure due to invalid script in test Sets up xengine anew for each test rather than once for the while testsuite to improve isolation between tests. Stop listening for chat after the first 'script is running' chat is received to reduce test run time.
| * | | Add do-while co-op termination testJustin Clark-Casey (justincc)2013-01-221-2/+30
| | | | | | | | | | | | | | | | Minor changes to scripts in other tests.
| * | | Add single and comound while loop co-op termination testJustin Clark-Casey (justincc)2013-01-221-0/+44
| | | |
| * | | Fix bug in generating termination checks in compound statement for loop.Justin Clark-Casey (justincc)2013-01-222-3/+27
| | | | | | | | | | | | | | | | Add regression test for this case.
| * | | factor out common code in existing co-op termination regression testsJustin Clark-Casey (justincc)2013-01-221-55/+24
| | | |
| * | | Increase WaitForEventCompletionOnScriptStop to 120 secs to show that the ↵Justin Clark-Casey (justincc)2013-01-221-0/+4
| | | | | | | | | | | | | | | | co-op setting is active in its regression tests.
| * | | Add regression test TestStopOnLongForLoop()Justin Clark-Casey (justincc)2013-01-221-0/+59
| | | |
| * | | Implement non-wait co-operative termination of scripts for XEngine in ↵Justin Clark-Casey (justincc)2013-01-174-71/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addition to termination on wait. This involves inserting opensim_reserved_CheckForCoopTermination() calls in lsl -> c# translation at any place where the script could be in a loop with no wait calls. These places are for, while, do-while, label, user function call and manual event function call. Call goes through to an XEngineScriptBase which extends ScriptBase. IEngine is extended to supply necessary engine-specific parent class references and constructor parameters to Compiler. Unfortunately, since XEngineScriptBase has to be passed WaitHandle in its constructor, older compiled scripts will fail to load with an error on the OpenSim console. Such scripts will need to be recompiled, either by removing all *.dll files from the bin/ScriptEngines/<region-id> or by setting DeleteScriptsOnStartup = true in [XEngine] for one run. Automatic recompilation may be implemented in a later commit. This feature should not yet be used, default remains termination with Thread.Abort() which will work as normal once scripts are recompiled.
* | | | Merge branch 'avination' into careminsterMelanie2013-01-234-47/+71
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove the return value from llGiveMoney (it was a LSL extension of OpenSim) andMelanie2013-01-233-31/+29
| | | | | | | | | | | | | | | | | | | | make the function async so the script thread is not held up waiting for comms to an external server.
| * | | Guard against XMLRPC module ref being null, which will happen if it's disabledMelanie2013-01-231-3/+7
| | | |
| * | | Merge remote-tracking branch 'remotes/origin/avination' into teravusworkteravus2013-01-211-2/+0
| |\ \ \
generated by cgit v1.1 at 2024-10-24 13:21:37 +0000