670bb9cb8b
Merge remote-tracking branch 'remotes/origin/avination' into teravuswork
2013-01-16 17:52:02 -05:00
13e7085124
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 23:19:29 +01:00
de49440839
dont send a full grp update on stopmovetotarget. just a rootpart terse
2013-01-16 22:17:10 +00:00
ed735ffdd0
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 21:57:06 +01:00
30d5faa7fc
same for SetPrimParams
2013-01-16 20:55:16 +00:00
3d0f4b0ccb
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 21:35:13 +01:00
2464e65c8a
llSetPos on child prim, send only a part terse update and not a group one
2013-01-16 20:27:10 +00:00
5b86af36e6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 20:23:45 +01:00
582cb89beb
Add a way to put things at the front of the queue for any throttle group.
...
Adds a DoubleLocklessQueue and uses it for the outgoing buckets. Added
a flag value to the Throttle Type (again) because although it's hacky, it's
the best of a bad bunch to get the message through the UDP stack to where it's
needed.
2013-01-16 19:29:27 +01:00
206bfe0657
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
2013-01-16 17:05:37 +00:00
9c99ed26eb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-01-16 16:52:57 +00:00
5563a8916e
Complete removal of the now unused state queue
2013-01-16 16:45:18 +00:00
37fcf87946
Changed a couple of debug messages at the request of osgrid.
2013-01-16 08:20:32 -08:00
9910c5f8e1
Merge branch 'avination' into careminster
2013-01-16 15:50:34 +00:00
5c8cced0a1
Merge branch 'ubitwork' into avination
2013-01-16 16:47:59 +01:00
818254916c
JustinCC's core re-merge
2013-01-16 15:47:55 +00:00
518326b049
Merge branch 'ubitwork' into avination
2013-01-16 16:47:21 +01:00
91138014e2
Change all uses of the removed state queue to the task queue for now.
2013-01-16 17:12:56 +00:00
85aa1804df
Complete removal of the now unused state queue
2013-01-16 17:06:25 +00:00
d92d5ca1fd
Revert " fix STATE udp queue data rate since it is in use again, after being"
...
This reverts commit 4d92c6b39f
2013-01-16 16:46:43 +01:00
778ed1c05a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 16:35:09 +01:00
4d92c6b39f
fix STATE udp queue data rate since it is in use again, after being
...
removed by intel folks (?)( should it be used or removed ??)
2013-01-16 15:30:58 +00:00
451b6c0e82
Add admin_refresh_search command to RemoteAdmin
2013-01-16 14:52:04 +01:00
503705bfad
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 14:24:23 +01:00
94710a17a4
Merge branch 'avination' into ubitwork
2013-01-16 13:11:02 +00:00
8ee9daa121
BulletSim: add the editting children in linkset going phantom bug to TODO list.
2013-01-15 21:08:47 -08:00
5d098d8f17
BulletSim: don't modify angular parameters when doing LIMIT_MOTOR_UP.
...
It was a dumb idea to try and do a nose over feature for jumping cars anyway.
Add better logging of native shape creation/reuse so can tell the difference.
2013-01-15 21:08:46 -08:00
61ff79587b
BulletSim: add debugging messages to know when assets for physical
...
objects have been fetched.
Update TODO list with more work.
2013-01-15 21:08:46 -08:00
daef2b8d87
BulletSim: reduce maximum force a script can apply (like in llApplyImpulse)
...
to the documented maximum from the outragious number previously.
2013-01-15 21:08:46 -08:00
0963ece25b
Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)
...
This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability.
If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread.
This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period.
Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented.
This commit, unlike 1b5c41c
2013-01-16 02:07:43 +00:00
b8949024bc
Revert "Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)"
...
Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api.
This reverts commit 1b5c41c14a
2013-01-16 01:45:09 +00:00
1ce39ed5f5
Merge branch 'master' into careminster
2013-01-16 01:13:28 +00:00
70fa41863d
Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster
2013-01-16 01:13:14 +00:00
3867b518de
Merge commit '7978b349bd400d14b7ecd4f8274af1921f435fee' into careminster
2013-01-16 01:13:00 +00:00
fc5711fa7a
Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-01-16 01:11:20 +00:00
03a8a4426f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-16 00:20:18 +00:00
1b5c41c14a
Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)
...
This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability.
If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread.
This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period.
Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented.
2013-01-16 00:12:40 +00:00
b5f5400e06
Add Refresh() Method to ISerachModule to allow forcing a sim to resend it's
...
search data
2013-01-15 22:15:58 +01:00
b3939a431c
Fix llSetRegionPos and detail behaviors of llSet[Link]PrimitiveParams[Fast]()
...
regarding prim positioning.
2013-01-15 22:15:06 +01:00
fccb03227e
Instead of passing separate engine, part and item components to script APIs, pass down IScriptInstance instead.
...
This is to allow the future co-operative script thread terminate feature to detect and act upon termination requests.
This splits the assembly and state loading out from the ScriptInstance() constructor to a separate Load() method
in order to facilititate continued script logic regression testing.
2013-01-15 21:13:22 +00:00
f54b398540
Merge branch 'master' of /home/opensim/var/repo/opensim
2013-01-15 10:08:27 -05:00
ca3e0d67d2
Add Json-Rpc 2.0 To Registered Handlers
...
Added registration json-rpc handlers in the http server. Covers version 2.0
See: http://www.jsonrpc.org/specification
2013-01-15 10:04:16 -05:00
021964c6e0
BulletSim: tweeks to improve hover.
2013-01-15 04:24:24 -08:00
181d4c6fcb
BulletSim: temporarily disable banking and direction deflection
...
because the computations are wrong.
Add VehicleTorqueImpulse routines.
2013-01-15 02:58:14 -08:00
0374b2a0b4
BulletSim: fix logic for enabling unmanaged code debug messages.
...
Free pinned memory when physics engine is unloaded.
2013-01-15 02:21:38 -08:00
edf198b766
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-01-15 01:46:30 -08:00
13778c895a
BulletSim: by default, turn on continuious collision detection (CCD)
...
and enable friction computation caching. Remove dangerous BulletSim
settings from OpenSimDefaults.ini.
2013-01-15 01:44:34 -08:00
055b8a2d58
move resit fix to ScenePresence.cs and allow for requesting sit on objects other than the object currently sat on
2013-01-14 22:24:24 -08:00
b5d55c129a
test commit for new git install
2013-01-14 19:54:17 -08:00
1c240cd555
Print full stacktrace from plugin loading failure to help determine what went wrong, rather than a possibly unhelpful simple exception message.
2013-01-15 01:07:20 +00:00
teravus