aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-2424-245/+688
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Merge branch 'master' into coopterminationJustin Clark-Casey (justincc)2013-01-2458-12707/+1872
| |\
| | * BulletSim: remove setting of vehicle InterpolationRotationalVelocity.Robert Adams2013-01-232-36/+34
| | | | | | | | | | | | | | | | | | This doesn't seem to help the vehicle stability. Rename vehicle internal variables adding a "V" or "W" so it is clear when coordinates are vehicle or world relative.
| | * BulletSim: small change to center-of-mass computation left out last commitRobert Adams2013-01-231-3/+8
| | |
| | * BulletSim: center-of-gravity linkset changes. Not working yet.Robert Adams2013-01-234-29/+9
| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
| | * BulletSim: working on COMRobert Adams2013-01-234-7/+36
| | |
| | * BulletSim: fix build break introduced by previous commitRobert Adams2013-01-231-5/+0
| | |
| | * BulletSim: remove the unused RestoreBodyDependencies used by linksetsRobert Adams2013-01-233-33/+2
| | | | | | | | | | | | and vehicles and clean up code by removing their kludgyness.
| | * Add the Avination physics raycast glue so Core Physics can implement raycastMelanie2013-01-233-13/+129
| | |
| | * 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.
| * | Pass narrower WaitHandle rather than EventWaitHandle as co-op termination ↵Justin Clark-Casey (justincc)2013-01-235-6/+6
| | | | | | | | | | | | | | | | | | 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-233-28/+31
| | | | | | | | | | | | | | | | | | | | | | | | 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-235-27/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | minor: comment out Console.WriteLine debugging message in XEngineJustin Clark-Casey (justincc)2013-01-221-1/+1
| | |
| * | Add regression test TestStopOnLongForLoop()Justin Clark-Casey (justincc)2013-01-221-0/+59
| | |
| * | refactor: rename XEngineTest to more descriptive XEngineBasicTestsJustin Clark-Casey (justincc)2013-01-221-0/+0
| | |
| * | Implement non-wait co-operative termination of scripts for XEngine in ↵Justin Clark-Casey (justincc)2013-01-177-77/+271
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-239-83/+180
|\ \ \
| * | | 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.
| * | | EXPERIMENTAL - Comment out the check for the agent already being in transitMelanie2013-01-231-8/+9
| | | | | | | | | | | | | | | | | | | | to prevent avatars being locked into their sim on a failed teleport. May have side effects and must be revisited to fix right.
| * | | Guard against XMLRPC module ref being null, which will happen if it's disabledMelanie2013-01-231-3/+7
| | | |
| * | | * A better way to handle the last fix (This is in case the viewer provides a ↵teravus2013-01-211-10/+16
| | | | | | | | | | | | | | | | list of preferred formats, though, technically, the sim would pick the first provided format the old way). This just makes it more obvious what's happening.
| * | | Merge remote-tracking branch 'remotes/origin/avination' into teravusworkteravus2013-01-217-309/+82
| |\ \ \
| | * | | Add accessors to allow serializing rot and position targetsMelanie2013-01-211-2/+12
| | | | |
| | * | | Limit active at targets to 8Melanie2013-01-211-2/+6
| | | | |
| | * | | Prevent scene from holding references to SOGs with attargets beyond SOG deletionMelanie2013-01-211-6/+12
| | | | |
| | * | | Allow TeleportCancel packets to reset the transfer state machineMelanie2013-01-211-0/+6
| | | | |
| | * | | Implement HTTP Request froma thread pool to avoid packet congestionMelanie2013-01-201-14/+45
| | | | |
| | * | | Revert "Refactor scripted http request to use async calls rather than hard ↵Melanie2013-01-201-87/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | threads" This reverts commit 461ecd7cf9edebce45ab715901a7f3b02c216e7b.
| | * | | Refactor scripted http request to use async calls rather than hard threadsMelanie2013-01-201-53/+87
| | | | |
| | * | | Remove an extra ScriptSleep (merge artefact) from llSetLinkPrimitiveParamsFastMelanie2013-01-191-2/+0
| | | | |
| * | | | * The fallthrough of FetchTexture was no longer resulting in a 404 response ↵teravus2013-01-211-1/+10
| | | | | | | | | | | | | | | | | | | | on missing textures. It was just waiting and no event was being provided. This re-enables the 404 response.
| * | | | * Fix notecard loading - If the notecard name is formatted like a UUID but ↵teravus2013-01-211-11/+35
| | | | | | | | | | | | | | | | | | | | isn't an actual asset UUID, then try to load it like an asset id first, then try to load it as a task inventoryitem name. If the passed UUID is a string, try to load it like a task inventory item name.
* | | | | Merge branch 'master' into careminsterMelanie2013-01-232-4/+23
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-01-2353-12559/+1513
| |\ \ \ \
| * | | | | Add additional return statusBlueWall2013-01-232-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | Adding additional return status for JsonRpcMethod. Now returns true/false
* | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-01-2314-487/+259
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | careminster
| * \ \ \ \ \ Merge branch 'avination'Melanie2013-01-1914-487/+259
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
| | * | | | | Remove group IM test code also mentioning "OpenSimulator Testing"Melanie2013-01-191-26/+1
| | | | | | |
| | * | | | | Remove the core groups moduleMelanie2013-01-191-252/+0
| | | | | | |
| | * | | | | Kill the dumb Opensimulator Testing group again - for good.Melanie2013-01-191-8/+3
| | | |_|/ / | | |/| | |