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
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
e785242c49
Reintroduce the return value of llGiveMoney. The grid will crash and burn without it.
2013-01-24 18:23:39 +01:00
9d2e832b85
Null check the response body to make sure we're not crashing the script engine
2013-01-24 18:23:10 +01:00
d5b950633d
* Added in the manifold point dept on collision desc. In BulletSim engine BulletXNA.
2013-01-24 07:36:24 -05:00
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
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
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
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
2ce4a758e2
Merge branch 'master' into careminster
2013-01-24 00:27:00 +00:00
be4c8c4931
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2013-01-24 00:25:08 +00:00
957cea59a0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-24 00:24:13 +00:00
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
5b334079e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-23 16:23:11 -08:00
1c3d84fe03
BulletSim: pass up and report the real collision penetration.
2013-01-23 16:20:44 -08:00
55c6753b13
Merge branch 'master' into cooptermination
2013-01-24 00:03:44 +00:00
a1f78ceb37
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-24 00:02:43 +00:00
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
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
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
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
13182904da
BulletSim: small change to center-of-mass computation left out last commit
2013-01-23 14:25:30 -08:00
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
c1371ab786
BulletSim: working on COM
2013-01-23 14:25:06 -08:00
775fd6f8cc
BulletSim: fix build break introduced by previous commit
2013-01-23 14:24:54 -08:00
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
8c6984eac1
Implement get version RemoteAdmin call
2013-01-23 23:12:48 +01:00
0a5d806a36
Merge branch 'master' into careminster
2013-01-23 21:04:04 +00:00
c1795ed399
Add the Avination physics raycast glue so Core Physics can implement raycast
2013-01-23 21:03:24 +00:00
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
f72e284445
Merge branch 'master' into careminster
2013-01-23 19:46:36 +00:00
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
fc1c77b42d
Merge branch 'avination' into careminster
2013-01-23 19:31:27 +00:00
87022b1fb4
Merge branch 'master' into careminster
2013-01-23 19:31:22 +00:00
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
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
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
f667428283
Guard against XMLRPC module ref being null, which will happen if it's disabled
2013-01-23 16:11:37 +01:00
2841ed05cf
Merge branch 'master' of /home/opensim/var/repo/opensim
2013-01-23 08:16:18 -05:00
1776986dc3
Add additional return status
...
Adding additional return status for JsonRpcMethod. Now returns true/false
2013-01-23 08:14:21 -05:00
74e04c0f03
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2013-01-23 02:39:30 +00:00
cc4cfd9fa8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
2013-01-23 02:38:59 +00:00
cf168194e5
If ScriptStopStrategy hasn't been set to co-op in [XEngine] config, then 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.
2013-01-23 02:36:43 +00:00
9d1989e64f
* Handle a NRE with Baked Textures that may result in a failed appearance. This may be an issue, or it may be a symptom.
2013-01-22 18:49:50 -05:00
80b1e32bfa
BulletSim: Tweeks to vehicle motion.
...
Pass through old angular velocity making for smoother transitions.
Remove some old kludges for angular motion (damping and rotvel suppression).
2013-01-21 23:43:24 -08:00
be60c0b010
* A better way to handle the last fix (This is in case the viewer provides a 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.
2013-01-21 22:08:51 -05:00
6007eae00f
Merge remote-tracking branch 'remotes/origin/avination' into teravuswork
2013-01-21 21:34:49 -05:00
89676b8a48
* The fallthrough of FetchTexture was no longer resulting in a 404 response on missing textures. It was just waiting and no event was being provided. This re-enables the 404 response.
2013-01-21 21:32:48 -05:00
9a4914e58c
Add co-op termination regression test for infinite recursive manual call on event function.
...
Such code would normally terminate quickly with a stack overflow exception anyway.
2013-01-22 02:32:40 +00:00
0727784186
Set script delay factor to 0 in co-op termination tests
...
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.
2013-01-22 02:26:04 +00:00
Melanie