aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-2524-192/+1047
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * BulletSim: reduce the zeroing threshold for rotational velocity.Robert Adams2013-01-241-3/+1
| | | | | | | | | | Sometimes settling of a vehicle from gravity introduces small velocities that need to be kept.
| * BulletSim: disable CCD (continuious collision detection) andRobert Adams2013-01-241-3/+3
| | | | | | | | | | contact processing threshold since the first didn't solve tunneling problems but used resources and the latter caused instabilities.
| * BulletSim: zero motion on an object that we pop up because it isRobert Adams2013-01-241-1/+7
| | | | | | | | | | below terrain. If the position is being corrected because it is out of bounds, all other movement rules are out the window.
| * BulletSim: remove exception that can happen when setting physics parameters ↵Robert Adams2013-01-241-2/+2
| | | | | | | | from the console.
| * Mantis 6508 llHTTPResponse body is incorrectly interpreted by IETalun2013-01-241-1/+15
| | | | | | | | | | | | | | | | | | This patch html escapes responses going to IE so that they cannot be interpreted as HTML if the response type is "text/plain". This has no effect if the reponse type has been set to "text/html" by osSetContentType Signed-off-by: nebadon <michael@osgrid.org>
| * Add JSONification of WebStats module. Adds a '?json' query parameterRobert Adams2013-01-2413-12/+658
| | | | | | | | | | | | to the fetch URL to return the data in JSON format. Also adds a simple 'sim.html' that uses JavaScript to display the JSON data. Not pretty but an example.
| * * Added in the manifold point dept on collision desc. In BulletSim engine ↵teravus2013-01-241-5/+64
| | | | | | | | BulletXNA.
| * * Repairs the Object updates, Collision updates, and Child Prim methods ↵teravus2013-01-243-164/+282
| | | | | | | | | | | | making the bulletXNA engine work again. * The only thing that had an issue was when creating a new RigidBody, BulletXNA didn't know the type SimMotionState and the upcast type is unknown in the constructor. Therefore, I had to update the IMotionState with a new method 'SetBody'. All of the duplicated type information has been removed and BulletXNA is not relying on any non-standard types external to the library.
| * * This makes the non-physics llCastRay 'better'. It's not 'correctly ↵teravus2013-01-232-4/+18
| | | | | | | | 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-249-18/+54
|\ \
| * | 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.
| * | Null check the response body to make sure we're not crashing the script engineMelanie2013-01-241-0/+6
| | |
| * | Implement get version RemoteAdmin callMelanie2013-01-232-2/+18
| | |
| * | 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-234-12/+12
| | | | | | | | | | | | 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-248-4/+11
|\ \ \ | | |/ | |/|
| * | 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
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-246-2/+4
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-01-2317-144/+672
| | |\ \
| | * | | BulletSim: pass up and report the real collision penetration.Robert Adams2013-01-236-2/+4
| | | | |
| * | | | 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-2427-258/+756
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | | Merge branch 'master' into coopterminationJustin Clark-Casey (justincc)2013-01-2465-12747/+1925
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-2459-12676/+1675
| | |\ \
| | | * | 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.
| | * | | 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
| * | | | Add information on ScriptStopStrategy to [XEngine] in OpenSimDefaults.ini ↵Justin Clark-Casey (justincc)2013-01-232-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and OpenSim.ini.example. Default remains abort. This setting controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op) co-op should be more stable but this option is experimental. If moving from co-op to abort, existing script DLLs will need to be recompiled. This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/ One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
| * | | | 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-236-27/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |
generated by cgit v1.1 at 2024-10-24 19:22:30 +0000