Justin Clark-Casey (justincc)
f557d7e828
Add basic JsonCreateStore() regression test
2013-01-25 01:48:31 +00:00
Robert Adams
6a5d088197
BulletSim: reduce the force of gravity on ground vehicles when they
...
are on the ground. Makes them a little more stable.
2013-01-24 16:26:04 -08:00
Melanie
0b8bf69470
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
2013-01-25 00:10:32 +00:00
Melanie
c6e6614a44
Merge branch 'avination' into careminster
2013-01-24 23:25:38 +00:00
Robert Adams
a2a32fc844
BulletSim: reduce the zeroing threshold for rotational velocity.
...
Sometimes settling of a vehicle from gravity introduces small
velocities that need to be kept.
2013-01-24 14:36:00 -08:00
Robert Adams
591faac3ac
BulletSim: disable CCD (continuious collision detection) and
...
contact processing threshold since the first didn't solve tunneling
problems but used resources and the latter caused instabilities.
2013-01-24 14:35:42 -08:00
Robert Adams
2cf29c87bc
BulletSim: zero motion on an object that we pop up because it is
...
below terrain. If the position is being corrected because it is out
of bounds, all other movement rules are out the window.
2013-01-24 14:35:23 -08:00
Robert Adams
3ecfddd791
BulletSim: remove exception that can happen when setting physics parameters from the console.
2013-01-24 14:35:05 -08:00
Talun
71f7bfc2ff
Mantis 6508 llHTTPResponse body is incorrectly interpreted by IE
...
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>
2013-01-24 14:48:20 -07:00
Melanie
789e9901dd
Make llGiveMoney async again. The return value is now the constant 1 to make
...
scripts work properly. Scripts will no longer receive a failure indication through
this return value;
2013-01-24 21:32:25 +01:00
Robert Adams
427ab219b8
Add JSONification of WebStats module. Adds a '?json' query parameter
...
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.
2013-01-24 10:44:57 -08:00
Melanie
e785242c49
Reintroduce the return value of llGiveMoney. The grid will crash and burn without it.
2013-01-24 18:23:39 +01:00
Melanie
9d2e832b85
Null check the response body to make sure we're not crashing the script engine
2013-01-24 18:23:10 +01:00
teravus
d5b950633d
* Added in the manifold point dept on collision desc. In BulletSim engine BulletXNA.
2013-01-24 07:36:24 -05:00
teravus
ba9d6b7337
* Repairs the Object updates, Collision updates, and Child Prim methods 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.
2013-01-24 07:11:32 -05:00
teravus
878df52515
* This makes the non-physics llCastRay 'better'. It's not 'correctly working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray.
2013-01-23 21:58:51 -05:00
Justin Clark-Casey (justincc)
f7feed4d44
Remove unnecessary System.Linq reference from Compiler.cs
...
Hopefully will fix windows build via compile.bat
2013-01-24 01:11:04 +00:00
Justin Clark-Casey (justincc)
b775761104
Disable the not very useful infinite recursion co-op termination tests for 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
2013-01-24 00:31:42 +00:00
Melanie
2ce4a758e2
Merge branch 'master' into careminster
2013-01-24 00:27:00 +00:00
Melanie
be4c8c4931
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2013-01-24 00:25:08 +00:00
Justin Clark-Casey (justincc)
957cea59a0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-24 00:24:13 +00:00
Justin Clark-Casey (justincc)
1a610f30d8
Fix mono 2.4.3 build break by using CreateInstanceAndUnwrap 9 method call deprecated in later .net versions
2013-01-24 00:23:12 +00:00
Robert Adams
5b334079e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-23 16:23:11 -08:00
Robert Adams
1c3d84fe03
BulletSim: pass up and report the real collision penetration.
2013-01-23 16:20:44 -08:00
Justin Clark-Casey (justincc)
55c6753b13
Merge branch 'master' into cooptermination
2013-01-24 00:03:44 +00:00
Justin Clark-Casey (justincc)
a1f78ceb37
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-24 00:02:43 +00:00
Justin Clark-Casey (justincc)
c51cae8fe8
Add information on ScriptStopStrategy to [XEngine] in OpenSimDefaults.ini 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
2013-01-23 23:57:09 +00:00
Justin Clark-Casey (justincc)
8a22ac3f94
Pass narrower WaitHandle rather than EventWaitHandle as co-op termination wait handle to script APIs.
...
APIs don't need to reference any methods on EventWaitHandle
2013-01-23 23:38:08 +00:00
Justin Clark-Casey (justincc)
72dd3633ee
Improve logging by making it clearer which script is failing if an assembly 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
2013-01-23 23:34:15 +00:00
Robert Adams
a7b810ddee
BulletSim: remove setting of vehicle InterpolationRotationalVelocity.
...
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.
2013-01-23 14:25:42 -08:00
Robert Adams
13182904da
BulletSim: small change to center-of-mass computation left out last commit
2013-01-23 14:25:30 -08:00
Robert Adams
a5e9c665f0
BulletSim: center-of-gravity linkset changes. Not working yet.
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
2013-01-23 14:25:18 -08:00
Robert Adams
c1371ab786
BulletSim: working on COM
2013-01-23 14:25:06 -08:00
Robert Adams
775fd6f8cc
BulletSim: fix build break introduced by previous commit
2013-01-23 14:24:54 -08:00
Robert Adams
a0d460e6bf
BulletSim: remove the unused RestoreBodyDependencies used by linksets
...
and vehicles and clean up code by removing their kludgyness.
2013-01-23 14:24:42 -08:00
Melanie
8c6984eac1
Implement get version RemoteAdmin call
2013-01-23 23:12:48 +01:00
Melanie
0a5d806a36
Merge branch 'master' into careminster
2013-01-23 21:04:04 +00:00
Melanie
c1795ed399
Add the Avination physics raycast glue so Core Physics can implement raycast
2013-01-23 21:03:24 +00:00
Melanie
dd6ddcc7a5
Prevent double ground collisions and prefer the physics result if there is one.
...
ODE is known to not see the ground sometimes on raycast so the double test is
needed.
2013-01-23 20:58:47 +01:00
Melanie
f72e284445
Merge branch 'master' into careminster
2013-01-23 19:46:36 +00:00
Melanie
6a2b673fca
Remove the return value from llGiveMoney and add llTransferLindenDollars. Also
...
make llGiveMoney async so the script thread is not held up waiting for comms
to an external server.
2013-01-23 19:45:36 +00:00
Melanie
fc1c77b42d
Merge branch 'avination' into careminster
2013-01-23 19:31:27 +00:00
Melanie
87022b1fb4
Merge branch 'master' into careminster
2013-01-23 19:31:22 +00:00
Melanie
c75508ec8d
Fix a type (Suports => Supports). Also put the normal terrain collision check
...
into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
2013-01-23 20:29:05 +01:00
Melanie
47f18caa22
Remove the return value from llGiveMoney (it was a LSL extension of OpenSim) and
...
make the function async so the script thread is not held up waiting for comms
to an external server.
2013-01-23 18:58:29 +01:00
Melanie
997d53e532
EXPERIMENTAL - Comment out the check for the agent already being in transit
...
to prevent avatars being locked into their sim on a failed teleport.
May have side effects and must be revisited to fix right.
2013-01-23 18:17:49 +01:00
Melanie
f667428283
Guard against XMLRPC module ref being null, which will happen if it's disabled
2013-01-23 16:11:37 +01:00
BlueWall
2841ed05cf
Merge branch 'master' of /home/opensim/var/repo/opensim
2013-01-23 08:16:18 -05:00
BlueWall
1776986dc3
Add additional return status
...
Adding additional return status for JsonRpcMethod. Now returns true/false
2013-01-23 08:14:21 -05:00
Melanie
74e04c0f03
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2013-01-23 02:39:30 +00:00