UbitUmarov
2464e65c8a
llSetPos on child prim, send only a part terse update and not a group one
2013-01-16 20:27:10 +00:00
Melanie
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
Melanie
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
Melanie
9c99ed26eb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-01-16 16:52:57 +00:00
Melanie
5563a8916e
Complete removal of the now unused state queue
2013-01-16 16:45:18 +00:00
Diva Canto
37fcf87946
Changed a couple of debug messages at the request of osgrid.
2013-01-16 08:20:32 -08:00
Melanie
9910c5f8e1
Merge branch 'avination' into careminster
2013-01-16 15:50:34 +00:00
Melanie
818254916c
JustinCC's core re-merge
2013-01-16 15:47:55 +00:00
Melanie
518326b049
Merge branch 'ubitwork' into avination
2013-01-16 16:47:21 +01:00
Melanie
91138014e2
Change all uses of the removed state queue to the task queue for now.
2013-01-16 17:12:56 +00:00
Melanie
85aa1804df
Complete removal of the now unused state queue
2013-01-16 17:06:25 +00:00
Melanie
451b6c0e82
Add admin_refresh_search command to RemoteAdmin
2013-01-16 14:52:04 +01:00
UbitUmarov
94710a17a4
Merge branch 'avination' into ubitwork
2013-01-16 13:11:02 +00:00
Robert Adams
8ee9daa121
BulletSim: add the editting children in linkset going phantom bug to TODO list.
2013-01-15 21:08:47 -08:00
Robert Adams
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
Robert Adams
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
Robert Adams
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
Justin Clark-Casey (justincc)
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
, passes the wait handle as an extra parameter through IScript.Initialize() instead of passing IScriptInstance itself.
2013-01-16 02:07:43 +00:00
Justin Clark-Casey (justincc)
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
Melanie
70fa41863d
Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster
2013-01-16 01:13:14 +00:00
Melanie
fc5711fa7a
Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-01-16 01:11:20 +00:00
Justin Clark-Casey (justincc)
03a8a4426f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-16 00:20:18 +00:00
Justin Clark-Casey (justincc)
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
Melanie
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
Melanie
b3939a431c
Fix llSetRegionPos and detail behaviors of llSet[Link]PrimitiveParams[Fast]()
...
regarding prim positioning.
2013-01-15 22:15:06 +01:00
Justin Clark-Casey (justincc)
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
BlueWall
f54b398540
Merge branch 'master' of /home/opensim/var/repo/opensim
2013-01-15 10:08:27 -05:00
BlueWall
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
Robert Adams
021964c6e0
BulletSim: tweeks to improve hover.
2013-01-15 04:24:24 -08:00
Robert Adams
181d4c6fcb
BulletSim: temporarily disable banking and direction deflection
...
because the computations are wrong.
Add VehicleTorqueImpulse routines.
2013-01-15 02:58:14 -08:00
Robert Adams
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
Robert Adams
edf198b766
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-01-15 01:46:30 -08:00
Robert Adams
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
dahlia
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
Justin Clark-Casey (justincc)
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
1c79e8a779
* Document the additional Visual Params of newer browsers in AvatarAppearance.VPElement so it can be easily looked up in code/module
2013-01-14 19:37:44 -05:00
Justin Clark-Casey (justincc)
c846cefda9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-15 00:24:51 +00:00
Robert Adams
4e1ca890c2
BulletSim: fix not moving physical objects below terrain to over terrain.
...
Add locking on register prestep action list preventing potential race conditions.
Little comment and formatting changes.
2013-01-14 15:46:46 -08:00
Justin Clark-Casey (justincc)
7978b349bd
refactor: Simplify ScriptInstance by retaining reference to SceneObjectPart instead of sometimes but not always looking it up.
2013-01-14 23:19:47 +00:00
Robert Adams
8bf0a9f85d
BulletSim: disable center-of-mass computation for linksets until debugged. Move physical prim above ground if it is underground. Previously tried to correct by applying and up force but the prim would never go through the ground.
2013-01-14 07:50:58 -08:00
UbitUmarov
b263587e21
try to patch getmesh Throttle (test)
2013-01-13 15:25:51 +00:00
Melanie
b924e333b7
Merge branch 'avination' into careminster
2013-01-13 13:44:28 +00:00
Melanie
923e5df7ae
Merge branch 'master' into careminster
2013-01-13 13:44:24 +00:00
dahlia
2eb0d8b617
add some sanity checking to HandleAgentRequestSit handler
2013-01-13 13:43:59 +00:00
UbitUmarov
2028787c0d
prevent potencial invalid refs
2013-01-13 12:25:41 +00:00
Robert Adams
459fcd81c9
BulletSim: move center of gravity of linkset to its geometric center.
...
Necessitated allowing simulator and physical position of a body to
get out of sync since Bullet assumes that <0,0,0> is the center of mass.
Update DLLs and SOs for the UpdateChildTransform so positions of
individual prim in a linkset can be implemented.
2013-01-11 16:47:53 -08:00
Robert Adams
eacc2561d1
BulletSim: add osGetPhysicsEngineType() LSL function and update
...
the physics engines to return the name that is specified in the INI
file ("physics = XXX") as the type of engine.
This os function is a little different than the others in that it
does not throw an exception of one is not privilaged to use it.
It merely returns an empty string.
2013-01-11 16:47:35 -08:00
Robert Adams
93adc4cb66
BulletSim: Add IsSelected attribute to physical objects. Have vehicles check to see if physical before trying to step. Replace vehicle gravity application. Previously relying on Bullet to apply gravity but since vehicles over-ride the velocity calculation, gravity never had a chance to accelerate the body down. Added AddForceImpulse as well as AddForce for those who need to apply immediate velocity updates. Use the impulse to apply the linear motion.
2013-01-11 16:47:20 -08:00
Robert Adams
daacd4deed
Fix exception reporting in SceneObjectPart so it logs what the exception is rather than just saying it happened.
2013-01-11 16:47:07 -08:00
Robert Adams
7e58bbaac6
BulletSim: Redo linear function coding so they can better interact. New algorithm for limitMotorUp that relies on going up when not colliding rather than distance from ground. Add parameter for turning on and off embedded source vehicle debugging.
2013-01-11 16:46:53 -08:00
Robert Adams
98168edc29
BulletSim: remove double application of buoyancy. Centralize computation of buoyancy. Add motor angular debugging controls.
2013-01-11 16:46:38 -08:00
Robert Adams
b592ec265b
BulletSim: fix the 'No recognised physics mesh found ...' error spew by remembering that the last asset fetch failed until the simulator resets the shape parameters.
2013-01-11 16:44:34 -08:00
UbitUmarov
fcf3960168
make sure keyframe rotations are normalized
2013-01-11 20:25:12 +00:00
UbitUmarov
a892dbba63
go back bypassing sog updates control (test)
2013-01-11 18:18:22 +00:00
UbitUmarov
d7f0bf04f6
update the last information sent in terse updates where they are sent to all
...
clients and not only on Scheduled sends
2013-01-11 16:24:48 +00:00
UbitUmarov
819f4b338d
remove redundant lastPhysGroupPos and lastPhysGroupRot checks
...
in SOG Update(). rootpart does more complet checks
2013-01-11 16:02:14 +00:00
UbitUmarov
1f9dbdf8b8
same for AngularVelocity. Use normal terse updates in place of sending
...
imediatly. If that's good for physics, needs to be good for this
2013-01-11 14:16:45 +00:00
UbitUmarov
756d53db5e
keyframe. Don't use group UpdateRotation since this enqueues a terse
...
update and we are sending them imediatly
2013-01-11 13:39:14 +00:00
dahlia
72cc94cfbc
add some sanity checking to HandleAgentRequestSit handler
2013-01-10 20:21:18 -08:00
Justin Clark-Casey (justincc)
660d36a5b0
Implement a workaround solution for saving manual script state changes by the user before logout instead of wrongly removing the script early.
...
This workaround relies on the fact that a closing client goes inactive before the attachments derez calls happen.
This reverts the change to remove scripts too early instead of stopping them, since the the two step stop then remove is necessary to execute the detach event.
2013-01-11 02:28:43 +00:00
Melanie
f74915ed4f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-01-11 02:13:10 +00:00
Justin Clark-Casey (justincc)
05ac6d3209
Save attachments on detach/exit if a contained script state has been changed.
...
This involves making Attachments module listen for start/stop script changes.
It also involves removing the script from the region on detach in the same manner as every other DeleteSceneObject() call rather than simply stopping it
This is necessary tue to the bad assymetry of start and stop script triggers but it appears to be the correct behaviour anyway, as detached objects are completely gone from the sim.
Not just in a state where their scripts have been stopped.
2013-01-11 01:46:36 +00:00
Justin Clark-Casey (justincc)
26347307ec
Fix a regression in the last few scene commands changes where setting these via the viewer estate dialog stopped working.
...
Forgot to register the new interface.
Also removes some code which got included by adpating an existing module.
2013-01-11 00:08:52 +00:00
Justin Clark-Casey (justincc)
f3a2bbbd93
Add "debug scene get" console command to list current scene options
2013-01-10 23:56:11 +00:00
Justin Clark-Casey (justincc)
a16ae5d7e3
Move scene debug commands into separate module. Command changes from "debug scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
2013-01-10 23:49:48 +00:00
Justin Clark-Casey (justincc)
983e458bb6
refactor: route the final scene backup through the same code that handles periodic backup
...
This is rather than making unnecessary duplicate checks that the SOG later performs again.
2013-01-10 22:59:40 +00:00
Justin Clark-Casey (justincc)
17f21ba9a0
minor: Capitalize GroupsModule command category
2013-01-10 22:46:25 +00:00
Justin Clark-Casey (justincc)
e65737be93
minor: add missing newline to "debug scene" console command
2013-01-10 22:42:33 +00:00
Justin Clark-Casey (justincc)
f566dc0618
Remove unimplemented "debug teleport" console command
2013-01-10 22:42:12 +00:00
Justin Clark-Casey (justincc)
701ca1e4b8
Add "debug scene pbackup true|false" console command. This enables or disable periodic scene backup. For debug purposes.
...
If false, scene is still saved on shutdown.
2013-01-10 22:38:48 +00:00
Justin Clark-Casey (justincc)
170d376967
On baked texture save, replace any HG ID with an ordinary asset ID so the HGAssetBroker doesn't try to save back to the avatar's originating region
2013-01-10 01:45:56 +00:00
Melanie
3a495ccd56
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2013-01-10 01:38:03 +00:00
Justin Clark-Casey (justincc)
84407e322f
revert accidental change to MemoryWatchdog stat calculation in previous b1b4687
2013-01-10 01:30:00 +00:00
Melanie
aecb32b74e
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-01-10 01:25:07 +00:00
Justin Clark-Casey (justincc)
b1b4687250
Add "show script timers" command to show script timers. For debug purposes.
...
Also, "show sensors" changes to "show script sensors".
2013-01-10 00:57:49 +00:00
Justin Clark-Casey (justincc)
a0000a034f
Add "show sensors" command to show script sensor information for debug purposes.
2013-01-10 00:32:22 +00:00
Melanie
949da1d4af
Change IsRoot to use ReferenceEquals to prevent operator == messiness
2013-01-09 20:07:21 +01:00
UbitUmarov
b70d50edf2
fix llGetRot and parameters prim_rotation for attachments. Only on
...
LSL_api to avoid side effects for now
2013-01-09 17:59:32 +00:00
UbitUmarov
b528281018
stop endless loop in lGetLinkPrimitiveParams
2013-01-09 17:01:09 +00:00
Melanie
27b0914681
Prevent a null ref in llGetLinkPrimiteveParams. Still not a fix for the real
...
issue.
2013-01-09 16:01:00 +01:00
Melanie
7d519fde3b
Merge branch 'teravuswork' into avination
2013-01-09 09:19:52 +01:00
Justin Clark-Casey (justincc)
290dc274ec
minor: Remove unnecessary commented out code from last commit c28a2f05
and fix up code comment
2013-01-09 01:04:43 +00:00
Justin Clark-Casey (justincc)
c28a2f05ca
minor: make spacing consistent in console help output
2013-01-09 00:54:28 +00:00
Melanie
e4fad4a09d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-01-09 00:21:43 +00:00
Robert Adams
df1d7414ad
BulletSim: Fix hover height (boats float at the correct level).
...
Fix problem of vehicles going crazy when backing up.
2013-01-08 16:37:49 -08:00
Melanie
f16c4a254c
Revert "Prevent empty Anim Packs"
...
This reverts commit 5561333668
.
2013-01-09 00:20:24 +00:00
Melanie
c1c540f454
Revert "Fix sequence id fr default anim"
...
This reverts commit a775931a0c
.
2013-01-09 00:20:14 +00:00
Justin Clark-Casey (justincc)
3d5e3e35b7
minor: Fix command match of "debug script" command to "debug scripts" to match other scripts commands (and it's own short help text)
2013-01-09 00:08:08 +00:00
Justin Clark-Casey (justincc)
5fa4b8b144
minor: Allow "script *" console commands to take multiple script item ids
2013-01-09 00:01:48 +00:00
Melanie
a775931a0c
Fix sequence id fr default anim
2013-01-08 23:36:05 +00:00
Melanie
5561333668
Prevent empty Anim Packs
2013-01-08 23:12:32 +00:00
Melanie
92db4ef068
Revert "Prevent empty Anim Packs"
...
This reverts commit ab053df706
.
2013-01-09 00:11:08 +01:00
Melanie
be844030ce
Revert "Fix sequence id fr default anim"
...
This reverts commit 8f37f2ca7e
.
2013-01-09 00:10:57 +01:00
Melanie
2ac96dd181
Add the new UpdateAgentInformation cap to make maturity on more recent viewers
...
work.
2013-01-08 22:52:14 +00:00
Melanie
8f37f2ca7e
Fix sequence id fr default anim
2013-01-08 23:24:34 +01:00
Melanie
ab053df706
Prevent empty Anim Packs
2013-01-08 23:01:09 +01:00
Melanie
0a393b317d
Add the new UpdateAgentInformation cap to make maturity on more recent viewers
...
work.
2013-01-08 22:32:39 +01:00
Melanie
0aabb93ef3
Remove now superfluous update of m_lastSize
2013-01-08 14:00:40 +01:00
Melanie
e1cfa846ea
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-08 13:58:42 +01:00
UbitUmarov
fb088a48ac
also update m_lastSize in SendAvatarDataToAllAgents so more paths update
...
it
2013-01-08 14:09:01 +00:00
Melanie
ef8f03b711
Prevent avatar data from being sent during login when it's not valid and
...
crashes login on some viewers.
2013-01-08 13:57:45 +01:00
Melanie
09d41f4f78
Revert "Remove sending AvatarData because this also happens on login, where it chokes"
...
This reverts commit d1fa650c3f
.
2013-01-08 13:11:04 +01:00
Melanie
f86278e389
Merge branch 'teravuswork' into avination
2013-01-08 12:14:08 +01:00
Melanie
4cd1fd7485
Merge branch 'ubitwork' into avination
2013-01-08 12:14:01 +01:00
Melanie
d1fa650c3f
Remove sending AvatarData because this also happens on login, where it chokes
...
Firestorm, Singularity and other viewers with the new appearance pipeline.
2013-01-08 12:08:34 +01:00
Robert Adams
1603606f1d
BulletSim: improve vehicle angular banking and deflection computation. Rotate angular correction forces to be world relative rather than vehicle relative.
2013-01-07 22:00:50 -08:00
UbitUmarov
126e73c5ed
put back position and rot change check before sending releasing plane constrain
2013-01-08 02:29:21 +00:00
UbitUmarov
1bf553fd65
reduce sampling of camera raycasts to previus value
2013-01-08 01:12:00 +00:00
UbitUmarov
d5066ae678
* DAnger, TEST * change camera plane collision detection. Still bounces on
...
* prim edges due to camera lag
2013-01-08 00:21:09 +00:00
Robert Adams
8452c0a870
BulletSim: add function to push avatar up when hitting stairs.
...
It looks like BulletSim and ODE rely on penetration correction to cause
the avatar to move up and thus allowing walking up stairs. Object
penetration was minimized for walking and flying (so one doesn't go
through walls) and this stopped stairs from working. This commit
introduces avatar movement code to check for collisions at the
feet while walking and attempts to raise the avatar for the steps.
Not yet perfect but movement is better.
2013-01-07 16:05:02 -08:00
Robert Adams
599dbc3d95
BulletSim: fix exception when re-creating the terrain when loading an OAR file
2013-01-07 16:04:21 -08:00
Melanie
910a94d143
Merge branch 'ubitwork' into avination
2013-01-07 15:06:17 +01:00
UbitUmarov
d2cb2da790
also exclude land
2013-01-07 11:03:36 +00:00
UbitUmarov
982328b4ed
exclude avatars from unfiltered RaycastWorld
2013-01-07 10:56:30 +00:00
UbitUmarov
ca40e656ab
in raycast for camera exclude self detection
2013-01-07 10:35:55 +00:00
Robert Adams
2e5222055f
BulletSim: comments and removing small compile errors introduced in last commit.
2013-01-06 22:56:16 -08:00
Robert Adams
9393403253
BulletSim: update DLLs and SOs with better debugging output.
...
Add definition of hand crafted avatar mesh. Not used yet.
Comments and cleanup.
2013-01-06 14:01:15 -08:00
UbitUmarov
dc6b7bb5c9
don't try to read geom positions outside main ode thread :(
2013-01-06 12:07:16 +00:00
Melanie
083ac92b34
Merge branch 'avination' into careminster
2013-01-06 10:52:22 +00:00
Melanie
40955fee2a
Merge branch 'master' into careminster
2013-01-06 10:52:16 +00:00
Robert Adams
2eba80a8cd
BulletSim: fix problem where mesh shapes were physically just their bounding box and not the complete mesh. Fill mesh physical objects are back.
2013-01-04 17:06:52 -08:00
Robert Adams
48cfc6d089
BulletSim: implement llMoveToTarget by adding PIDActive, etc.
...
Implementation of non-vehicle hover but haven't tested it a lot.
Update TODO list.
2013-01-04 17:06:51 -08:00
Robert Adams
d0c7f7f050
BulletSim: add some features to the PID motor to make it more flexible.
2013-01-04 17:06:51 -08:00
Robert Adams
613f516007
BulletSim: convert avatar movement from a force to an impulse. Shouldn't
...
change functionality but removes an oddity in computing the force.
2013-01-04 17:06:50 -08:00
Robert Adams
2c6b269b6e
BulletSim: add initial implementation of llMoveToTarget and hover height.
...
Not all there yet.
2013-01-04 17:06:50 -08:00
Robert Adams
5432180027
BulletSim: reorganize motor code a little to pull together common functions.
...
Add BSFMotor.
2013-01-04 17:06:50 -08:00
Robert Adams
44492b3a49
BulletSim: add comments to force and impulse setting functions
...
so it is clear what Bullet is actually doing with the set values.
2013-01-04 17:06:49 -08:00
Robert Adams
92a6958b6d
BulletSim: fix problem where pre-step actions would not replaced
...
by new registrations thus causing multiple instances of an action.
2013-01-04 17:06:49 -08:00
Robert Adams
2eda385f5e
BulletSim: add ResetBroadphasePool and ResetConstraintSolver diagnostic
...
functions. If values set from console, the functions are called. Looking
for why the collision pools fill up with unnecessary stuff.
2013-01-04 17:06:48 -08:00
Melanie
e62b14024f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-01-04 22:39:07 +00:00
Justin Clark-Casey (justincc)
7232cedd2b
Set default particle burst count to 1 instead of 0 in any set particle system script call that does not have an empty list.
...
As per http://opensimulator.org/mantis/view.php?id=6353
2013-01-04 21:37:11 +00:00
Justin Clark-Casey (justincc)
7e45096314
Fix build break caused by missing ) from dce2809
.
...
Was hand-typing in a line of code I had tested before but not retested this time
2013-01-04 21:22:51 +00:00
Justin Clark-Casey (justincc)
dce2809137
Automatically grant sit-related llRequestPermissions() for subsequent avatars sitting on the same scene obejct, instead of wrongly popping up request permissions dialog.
...
Resolves http://opensimulator.org/mantis/view.php?id=6478
2013-01-04 21:18:53 +00:00
Justin Clark-Casey (justincc)
a3bf3a2aa5
refactor: simplify llGetNumberOfPrims() to return prim count + sitting avatar count rather than independently inspecting every scene presence
2013-01-04 20:56:39 +00:00
Justin Clark-Casey (justincc)
9869ca83b4
Fix llGetLinkName() to return the name of the last avatar sat as the last link number.
...
As per http://wiki.secondlife.com/wiki/LlGetLinkName
2013-01-04 20:54:11 +00:00
Justin Clark-Casey (justincc)
9503383887
Fix llGetLinkKey() to return the last sat avatar as the last link number.
...
As per http://wiki.secondlife.com/wiki/LlGetLinkKey
This is done by keeping a scene-object wide list of sitters.
This also fixes bugs in this function where linknums 0 and 1 weren't treated properly if there were sitting avatars on a single prim.
This also fixes a minor race condition for multiple concurrent sitters on a prim with no current sitters by locking on the object-wide list rather than individual sop lists
Addresses http://opensimulator.org/mantis/view.php?id=6477
2013-01-04 20:34:39 +00:00
UbitUmarov
c961cfe19e
bug fix, cleanup...
2013-01-03 21:53:21 +00:00
Justin Clark-Casey (justincc)
a75f24bb79
minor: Add some doc to the extremely unhelpful 'fudge....' comment as to why we're deselecting the prim in code before scheduling an update on attachment
2013-01-03 21:06:50 +00:00
Justin Clark-Casey (justincc)
7f195de303
Fix problem where object attached from ground often does not get attached properly.
...
It seems this is happening because we send a kill for objects that are selected when attached.
A code comment says that this is to get the client to deselect it, but v3 and v1 clients do this just fine without the kill.
Aims to address http://opensimulator.org/mantis/view.php?id=6456
2013-01-03 20:57:14 +00:00
UbitUmarov
a285ff7e69
check land permitions on sit target for unscripted sits
2013-01-03 14:27:21 +00:00
UbitUmarov
1665a0d636
make ResetMoveToTarget cancel any 'force' waiting to be applied to avatar
...
( by the odd use of Velocity)
2013-01-03 03:29:40 +00:00
UbitUmarov
d40cdd2649
cancel MoveToTarget (viewer 'go here") on sits
2013-01-03 02:25:27 +00:00
SignpostMarv
aa78df4a79
Scipt modules get the OpenMetaverse types, so lists passed as arguments to script module functions which then later call LSL_Types.list.GetVector3Item() or LSL_Types.list.GetQuaternionItem() methods would then trigger an InvalidCastException, which is now avoided.
2013-01-03 00:18:33 +00:00
SignpostMarv
a5ac6af16a
Improving documentation of AttachToAvatar and GetLine methods in LSL_Api.cs based on doxygen error output
2013-01-03 00:17:24 +00:00
SignpostMarv
79b7c571ff
updating documentation in SampleMoneyModule based on doxygen error log output; changing an xml-style hint to a uri-style hint in the class summary, improving documentation of Initialise method and removing a superfluous parameter, improving documentating of ClientClosed method and documenting an omitted parameter
2013-01-03 00:17:24 +00:00
Justin Clark-Casey (justincc)
589e3e8686
minor: Change channel digger replacement message in TerrainModule to Info from Warn.
...
This is to stop this unnecessarily triggering log analysis code which reports warn and error level statements.
2013-01-03 00:03:29 +00:00
Oren Hurvitz
1b826b4877
Allow registering regions whose names are equivalent under LIKE but not truly equal
2013-01-02 23:31:19 +00:00
Oren Hurvitz
1a6694b264
Fixed several problems with the Sun: some settings didn't work, or were inconsistently used. - The sun position is always calculated by combining the sun settings in the Region and Estate. This fixes the problem that 'UseEstateSun' didn't work. - To remove ambiguity, the EstateToolsSunUpdate event no longer accepts the sun's position as parameters. That's because the position is always calculated from the Region and Estate settings. - Use only the 'FixedSun' flag to determine whether the sun is fixed; not the 'UseGlobalTime' flag. - Don't change the region's 'SunPosition' field according to the sun's position: this field is used only to set the position when using a FixedSun. (The 'SunVector' field does get updated according to the sun's position in the sky)
2013-01-02 23:16:24 +00:00
Oren Hurvitz
24e486e9df
Fixed: the AvatarEnteringNewParcel event wasn't triggered in some cases
...
If an avatar moved between regions: A -> B -> A, then when returning to region A the AvatarEnteringNewParcel wasn't triggered. This happened because the ScenePresence in region A still remembered its previous 'currentParcelUUID', so it appeared as if the avatar didn't change parcels. Now, however, when a ScenePresence becomes a child presence we clear its 'currentParcelUUID'.
2013-01-02 23:00:23 +00:00
Oren Hurvitz
5097ba81d4
Added locking in NullRegionData.
...
This prevents errors when one thread iterates over the regions (e.g., from RegenerateMaptileAndReregister()) while another thread is adding a region.
2013-01-02 22:48:25 +00:00
Justin Clark-Casey (justincc)
8f31649fad
Fix indenting on ConsoleDisplayTable, align indenting on "show animations" console command
2013-01-02 22:37:50 +00:00
Justin Clark-Casey (justincc)
2db1f22b89
minor: minor code and log formatting fixes to recent changes in LandManagementModule
2013-01-02 22:31:18 +00:00
Oren Hurvitz
9784e4e07d
Changed locks to prevent deadlocks (especially during multi-region Load OAR)
2013-01-02 22:28:41 +00:00
Oren Hurvitz
d2f4ca0dfe
If Save OAR/IAR times-out while waiting for assets then notify the caller that the operation failed
2013-01-02 22:15:00 +00:00
Justin Clark-Casey (justincc)
6b55f51837
minor: Allow objects to be added directly to a row on a ConsoleDisplayTable rather than having to ToString() them first
2013-01-02 22:11:13 +00:00
UbitUmarov
a504704071
i try to fix avatar orientation in some cases..
2013-01-02 21:59:19 +00:00
Oren Hurvitz
70695a6ed9
Implemented Return Objects when it's invoked from the Top Colliders or Top Scripts dialogs
2013-01-02 21:59:01 +00:00
Justin Clark-Casey (justincc)
addab1244e
Add "show animations" console command for debug purposes.
...
This shows the current animation sequence and default anims for avatars.
2013-01-02 21:38:00 +00:00
UbitUmarov
be6b6bf191
add a lock to CollisionEventsThisFrame
2013-01-02 20:06:57 +00:00
UbitUmarov
7980a1d849
*TEST* avatar unscripted sit. Some guessing/automation
2013-01-02 19:39:46 +00:00
Justin Clark-Casey (justincc)
30e5e5cce6
If an NPC is unowned, then always auto-grant permissions requested via llRequestPermissions()
...
This is consistent with all other OSSL NPC functions that allow unowned avatars to be manipulated.
Aims to address http://opensimulator.org/mantis/view.php?id=6483
2013-01-02 19:25:52 +00:00
Melanie
7943c8d11c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-01-02 11:52:37 +00:00
teravus
92c26e4994
* ubit pointed out another place where that check needed to be updated and I normalized it.
2013-01-01 23:55:24 -05:00
teravus
f9148e5fc7
* This is actually the fix described the last commit.. I had commented it out to see if the problem had affected all attachments or just HUD attachments.
2013-01-01 23:11:46 -05:00
teravus
397aa74777
* Fixes the attachment scripted rotation bug. The problem is the code was relying on m_host.ParentId = 0 to determine if the attachment should be rotated against root prim offset. To fix it for attachments, we also need to check if the host's localID == RootPart's localID. otherwise we are cumulatively rotating against the host's root part rotation offset (which in this case, is it's own rotation)
2013-01-01 23:07:37 -05:00
Robert Adams
aa236b2020
BulletSim: add parameter to have Bullet output performance statistics
...
every so many frames. Default to off.
2013-01-01 17:27:34 -08:00
Robert Adams
b14b65ea95
BulletSim: move selection of the unmanaged Bullet DLL from BSPlugin
...
into the unmanaged Bullet interface class.
2013-01-01 17:27:33 -08:00
Robert Adams
9d840fd2ee
BulletSim: move over and port the interface for BulletXNA.
...
Copied BulletSNPlugin.BulletSimAPI to a new
BulletSPlugin.BSAPIXNA.cs and then modifyed the latter to
comply with the BSAPITemplate definition. Not totally debugged
but the code is all there for an INI variable to select either
unmanaged C++ Bullet or the C# version of Bullet.
2013-01-01 17:27:33 -08:00
Robert Adams
0662d109c2
BulletSim: fix line endings.
2013-01-01 17:27:33 -08:00
Robert Adams
04132d3af4
BulletSim: subclass Bullet[World|Body|Shape|Constraint] for unmanaged
...
to have pointers and managed to have objects.
Initial paste of XNA code. Commented out.
2013-01-01 17:27:32 -08:00
Oren Hurvitz
a0739a80a8
Fixed bugs when getting the root folder.
...
1. The error checking for the case where there's no "My Inventory" folder was
incorrect: it checked the wrong variable.
2. If GetSystemFolderForType() is called to get AssetType.RootFolder then
it should return the root folder immediately; not look for another root
folder below it.
2013-01-02 00:04:14 +00:00
Justin Clark-Casey (justincc)
bc9a7ba0d6
minor: Assign names to the different SmartThreadPools for debugging purposes.
...
A different approach to the patch in http://opensimulator.org/mantis/view.php?id=6462
that doesn't involve further forking of SmartThreadPool
2013-01-01 23:57:20 +00:00
Justin Clark-Casey (justincc)
416244051d
refactor: call Util.InitThreadPool() if we are initializing an uninitialized pool on first use rather than constructing it ourselves.
...
No functional change.
2013-01-01 23:50:38 +00:00
teravus
ce4b09cf63
Merge remote-tracking branch 'remotes/origin/avination' into teravuswork
2013-01-01 00:59:30 -05:00
teravus
2805ec6466
* Fixed a bug that replayed old cached appearance when changing outfits
...
* Added suser(bad client) DOS protection by limiting the max cacheitems to the maximum sane amount.
* Prevents potential numerous loops from running amok and index errors if the client purposely provides bad cache info.
* If the XBakes service wasn't running, the SetAvatarAppearance routine would crash when contacting the XBakes service even though it was in a Try/Catch for the appropriate error type. It only properly error handles with the type Exception :(. (commented on that because it's unusual)
2012-12-31 23:04:28 -05:00
Robert Adams
db3b6e8921
BulletSim: remove unused unmanaged memory reference functions from BSAPITemplate.
2012-12-31 19:57:26 -08:00
Robert Adams
6988b5ceaf
BulletSim: remove rigid body contruction functions from BSAPITemplate that relied on prebuilt construction info structures.
2012-12-31 19:57:25 -08:00
Robert Adams
9396ccc078
BulletSim: eliminate the use of the unmanaged HeightMapInfo structure.
...
Remove all related calls from the unmanaged and BSAPITemplate interfaces.
Update DLLs and SOs to include the version without HeightMapInfo structures.
2012-12-31 19:57:25 -08:00
Robert Adams
3d0fc70864
BulletSim: complete movement of BulletSimAPI functions to BSAPITemplate.
...
Update BulletSim DLLs and SOs with simplier step function interface.
2012-12-31 19:57:24 -08:00
Robert Adams
c2a7af18b6
BulletSim: nearly complete in conversion from BulletSimAPI to BSAPITemplate. Only initialization and debug fuctions left.
2012-12-31 19:57:23 -08:00
Robert Adams
5379d6d112
BulletSim: remove all the debug printing of pointer formatting (.ToString(X)) and replace it with a method on BulletBody, BulletShape, ...
2012-12-31 19:57:22 -08:00
Robert Adams
9218748321
BulletSim: another round of conversion: dynamics world and collision object functions.
2012-12-31 19:57:22 -08:00
Robert Adams
9fd0e1b080
BulletSim: add the implementation files for the two versions of Bullet:
...
unmanaged (C++) and managed (C#).
2012-12-31 19:57:21 -08:00
Robert Adams
48f718f39f
BulletSim: first round of conversion from direct BulletSimAPI interfacing by BulletSim core to using the BulletSimAPITemplate. Physical object creation and destruction first.
2012-12-31 19:57:21 -08:00
Robert Adams
203588e3c0
BulletSim: change physical data structures to classes. Add default
...
instantiations for PhysBody and PhysShape when BSPhysObject is created
to account for them being classes and not structures.
Update TODO list.
2012-12-31 19:57:21 -08:00
Robert Adams
4914d6c0ea
Resolve Mantis 6480 ( http://opensimulator.org/mantis/view.php?id=6480 )
...
by reversing the sign on the recoil computation and adding a
[XEngine]RecoilScaleFactor parameter which defaults to zero.
Testing in SL seems to show that there is not a recoil action there.
Or, at least, it is very small. If someone knows how small, the default
for the scale factor should be changed.
2012-12-31 19:57:20 -08:00
Robert Adams
26f364cc5d
Comment out test messages that go directly to the console.
2012-12-31 19:57:20 -08:00
Melanie
7e98dfd70b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-12-30 03:43:51 +00:00
Robert Adams
28a8949b9f
BulletSim: remove check for small motor movement because, while it
...
did the right thing for stopping (speed reducing to zero), it prevented
movement from starting (speed increasing from zero). Will revisit
when the generalize PID motor is debugged.
2012-12-29 10:19:47 -08:00
Robert Adams
0538096fa3
BulletSim: an 'if' to suppress multiple setting of avatar orientation.
...
Looks like the viewer bombards the server with avatar orientation
information (we're talking several hundred a second) when the avatar
is being turned or when walking. This change just reduces the number
of 'set' calls into unmanaged code.
2012-12-29 08:32:57 -08:00
Robert Adams
db6c0363f0
BulletSim: tweeking avatar capsule code in an attempt to have
...
asymmetrical avatar capsule work now that rotation is being passed
from the simulator. Turns out the Bullet capsule is just not very
functional: it doesn't scale properly, the implementation only half
does asymmetry and, in general, is hard to work with.
Avatar shape is about what it was before these changes.
Added initial data structures for avatar shape mesh.
2012-12-29 08:03:57 -08:00
teravus
6797ac1474
* This finishes the implementation of AgentCachedTexture. Requires the XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
2012-12-29 08:53:58 -05:00
Robert Adams
fdf8732cd7
ScenePresence passes the avatar rotation down to the physics engine. This will be a no-op for ODE but enables asymmetrical avatars for BulletSim.
2012-12-28 16:29:16 -08:00
Robert Adams
7266eeca6e
BulletSim: add 'AvatarAlwaysRunFactor' parameter and use in setTargetVelocity
...
to implement the 'always run' feature.
2012-12-28 12:01:57 -08:00
Robert Adams
70e0a86601
BulletSim: fix problem of avatars appearing to walk through walls
...
by moving the movement motor to a pre-step action and out of its
questionable previous home in UpdateProperties.
2012-12-28 11:56:07 -08:00
Melanie
3ab1bd0403
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-12-28 08:32:34 +00:00
Robert Adams
1f6aaad0b5
BulletSim: correct collision mask definition for linkset children.
...
Remove unused code. Add comments and TODOs.
2012-12-27 22:12:28 -08:00
Robert Adams
422f0fd6ec
BulletSim: fix physical object not interacting with static objects.
...
Another instance of the underlying Bullet doing, ah, helpful things
when items are added to the world.
2012-12-27 22:12:28 -08:00
Robert Adams
c1e7539c77
BulletSim: Parameterize nominal frame rate (55) and add parameters to dynamially turn on/off detailed, unmanaged data dumping of prims and vehicles.
2012-12-27 22:12:28 -08:00
Robert Adams
7a5f598399
BulletSim: move logic for IsColliding, CollidingGround and CollidingObj from individual sub-classes and up to parent BSPhysObject class.
2012-12-27 22:12:27 -08:00
Robert Adams
5afab9bcfe
Add check to always push terse updates for presences that have new velocities of zero.
2012-12-27 22:12:27 -08:00
Robert Adams
e57c0e6731
BulletSim: fix buoyancy so it's properly set by a script when an
...
object is selected.
Update TODO list.
2012-12-27 22:12:26 -08:00
Robert Adams
7230990679
BulletSim: fix odd code that wasn't really recomputing the mass of a
...
rebuilt linkset. I was burnt by making get/set methods with side
effects. I should know better.
2012-12-27 22:12:26 -08:00
Robert Adams
f3baed5827
BulletSim: add physical parameter min/max constants in BSParam. I just don't like raw numbers scattered around the code.
2012-12-27 22:12:25 -08:00
Robert Adams
e98e223927
BulletSim: complete applyImpulse function in BSCharacter (like I said
...
I did last time).
2012-12-27 22:12:25 -08:00
Melanie
258588d5b5
Merge branch 'master' into careminster
2012-12-26 01:16:08 +00:00
Robert Adams
bbc5a5089f
BulletSim: Rename some of the interface structures (BulletWorld, ...)
...
to get ready for...
Start creation of BulletAPITemplate. This defines the abstract interface
functions. Following commits will move over to the new interface.
This will enable switching between the managed and unmanaged version of
Bullet.
2012-12-24 20:18:06 -08:00
Robert Adams
4759a8acee
BulletSim: Default avatar density changed to 3.5 which is WAY closer
...
to the SL value.
Fixed frictin values for physical materials which were just wrong
which caused things that should have slipped to not.
2012-12-24 20:16:10 -08:00
Robert Adams
80cee1b85a
BulletSim: Fix single physical prim reporting its mass as zero.
...
Properly return root mass as mass of just the root prim rather
than the mass of the linkset. SOG has the logic to add the masses
together to get the linkset mass.
Update TODO list.
2012-12-24 08:56:02 -08:00
teravus
9318870607
* Update BulletSimN terrain implementation to default to Heightfield, it's less CPU intensive.
2012-12-23 16:17:18 -05:00
teravus
92e4f9f412
* Initial commit of BulletSimN (BulletSNPlugin). Purely C# implementation of BulletSim. This is designed to be /as close as possible/ to the BulletSim plugin while still being entirely in the managed space to make keeping it up to date easy as possible (no thinking work). This implementation is /slower/ then the c++ version just because it's fully managed, so it's not appropriate for huge sims, but it will run small ones OK. At the moment, it supports all known features of BulletSim. Think of it like.. POS but everything works. To use this plugin, set the physics plugin to BulletSimN.
2012-12-23 15:21:25 -05:00
Melanie
6eeb4cb3f7
Revert "Whitespace change to trigger ircbot"
...
This reverts commit ca30559b05
.
2012-12-23 18:10:34 +00:00
Melanie
ca30559b05
Whitespace change to trigger ircbot
2012-12-23 18:07:32 +00:00
Melanie
a126097d6b
Merge branch 'master' into careminster
2012-12-23 18:05:17 +00:00
Robert Adams
30807b81cc
BulletSim: modify avatar motor code to make falling movement better. Clean up some usages. Disable motor when done.
2012-12-22 17:09:40 -08:00
Robert Adams
144322a7c9
BulletSim: remove post step one-time taints (doesn't make any sense). Rename pre and post step event invocation routines to Trigger* to be consistant. Remove old, unused code.
2012-12-22 17:07:52 -08:00
Robert Adams
16e49035f7
BulletSim: add Enabled parameter and operation to motors.
2012-12-22 17:06:13 -08:00
Robert Adams
3e3c168987
Add helper routine Util.InRange()
2012-12-22 17:04:53 -08:00
Robert Adams
5b2cbc0ae6
BulletSim: remove all special vehicle code from BSScene. Replace per-frame updates for vehicles with per-frame action registration. One fewer special case.
2012-12-21 23:24:31 -08:00
Robert Adams
a54392d7cc
BulletSim: remove the movement decay while flying. Made flying slow down over time.
2012-12-21 23:05:05 -08:00
Robert Adams
37fb691ba5
BulletSim: Fix llApplyImpulse so it works after the first impulse. The problem was Bullet deactivating the object between the pushes (when, as far as the physics engine is concerned, it isn't moving).
2012-12-21 23:03:27 -08:00
Robert Adams
3d659fe97d
BulletSim: add BSPhysObject code to manage registrations of preStep events. Use same to implement setForce and setTorque so the values are restored at the beginning of each step (since Bullet zeros forces applied last step). Simplify implementation of AddForce and AddTorque by relying on the addition of forces in Bullet.
2012-12-21 17:27:53 -08:00
Melanie
2313a86e32
Merge branch 'ubitwork' into avination
2012-12-22 01:04:49 +01:00
teravus
77cc7ce399
* Partial Commit for Avatar Appearance to include the functionality of Cached Bakes.
2012-12-21 19:12:30 -05:00
Robert Adams
6dbf9c8ed4
BulletSim: repair vehicle problems introduced in previous 'improvements'. Fix line endings in BSParams.
2012-12-21 15:21:32 -08:00
Melanie
f6f2080539
Merge branch 'avination' into careminster
2012-12-21 22:16:22 +00:00
Melanie
569f39e124
Merge branch 'master' into careminster
2012-12-21 22:13:41 +00:00
Robert Adams
ae4d932e7f
BulletSim: Move all the parameter variables, tables and get and fetch logic to a separate, static class for easier addition and to remove all that bulk from the BSScene class.
2012-12-21 13:35:44 -08:00
Robert Adams
2e3e95e846
BulletSim: small fix to avatar movement motor use which keeps avatar from flying up forever. This doesn't fix the overall problem but keeps avatar flying from being totally unusable.
2012-12-21 10:04:12 -08:00
Robert Adams
8c99f63239
BulletSim: avatar movement smoothed with motor that modifies avatar velocity to target velocity. Fails in incorporating physical world effects (gravity) so avatar doesn't fly correctly.
2012-12-21 10:00:03 -08:00
Robert Adams
b4f8a05e9a
BulletSim: Better detail logging of VMotor actions.
2012-12-21 09:56:31 -08:00
Robert Adams
750492796d
BulletSim: begin movement of parameters from pinned memory block to variables all in managed code. Add note to TODO list to remember to do the rest. Other updates to TODO list.
2012-12-21 09:55:20 -08:00
Robert Adams
9d2f569d60
BulletSim: fix incorrectly defined property changed flag.
2012-12-20 16:06:52 -08:00
Robert Adams
e522bdb96a
BulletSim: Check for unspecified TimeScale in BSVMotor and don't scale if not specified. Add test dump routine. Don'e zero current and target values when error goes to zero as the values could be used externally to store the actual target values, etc.
2012-12-20 16:05:33 -08:00
Robert Adams
a5b2539cf9
BulletSim: replace use of funky nullable values for vehicle property update control (m_known* stuff). Bitmaps will be quicker to test and to clear.
2012-12-20 10:32:33 -08:00
Robert Adams
e73dac4deb
BulletSim: angularMotorUp working again (seems a little slow as it takes longer than timescale to correct, but getting better). Disabled angularDeflection (need to resolve interactions between angular corrections). Update TODO list.
2012-12-20 10:19:16 -08:00
Robert Adams
b7ad44e3a6
BulletSim: reorganize motor step code to separate error computation allowing subclass for PID error correction.
2012-12-20 08:35:36 -08:00
teravus
f9051c22d8
* Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to synchronize with Agni.
2012-12-19 22:14:20 -05:00
teravus
c648325d7c
Merge branch 'avination' of careminster:/var/git/careminster into teravuswork
2012-12-19 11:53:26 -05:00
Melanie
d1dd5a8ba9
Add the interfaces for the new Avination baked texture cache service
2012-12-19 13:04:41 +01:00
Robert Adams
a9b9c0f035
BulletSim: improve angularVerticalAttraction calculation to compute angular correction velocity rather than estimating correction (excuse to use trig functions).
2012-12-18 23:05:59 -08:00
Robert Adams
7b84bcfbb8
BulletSim: initial implementation of a PID motor. Not hooked up yet.
2012-12-18 22:59:59 -08:00
Robert Adams
cf89e29ac3
BulletSim: comments and TODO list update
2012-12-18 19:25:51 -08:00
Robert Adams
d15bfcf614
Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags.
2012-12-18 19:25:40 -08:00
Justin Clark-Casey (justincc)
ae67435146
Disable UDPPacketBuffer pooling for now to resolve an issue on Windows of interference between incoming packets.
...
On Windows, concurrent multi-threaded processing of inbound UDP somehow allows different data input processing to interfere with each other.
Possibly the endpoint reference is being switched, though I don't yet know the mechanism. Not seen on Mono.
Also resolveable by setting RecyclePackets = false or RecycleBaseUDPPackets = false in [PacketPool]
Or async_packet_handling = false in [ClientStack.LindenUDP]
For now, will simply disable this particular pooling though will revisit this issue.
In response to http://opensimulator.org/mantis/view.php?id=6468
2012-12-19 01:51:30 +00:00
teravus
29cdf0f3dd
* Merges BulletSim Updates to BulletSimN(BulletSNPlugin)
2012-12-18 15:00:10 -05:00
Robert Adams
225b564573
BulletSim: scale the force for external AddForce by the simulation
...
step time so it will be applied completely the next step. The internal
AddForce routine does not scale the force.
2012-12-26 10:25:50 -08:00
Robert Adams
d1ede1df3a
BulletSim: make llBuoyancy work. For some reason, Bullet resets an
...
object's individual gravity to the world gravity when the object
is added to the physical world.
2012-12-25 23:55:25 -08:00
Robert Adams
5f71ee57c4
BulletSim: stop avatar from sliding VERY slowly after walking by
...
only zeroing the movement motor in the UpdateProperties routine.
2012-12-25 23:54:10 -08:00
UbitUmarov
f185239fc3
Merge branch 'avination' into ubitwork
2012-12-18 10:05:43 +00:00
Melanie
79bdf464d3
Merge branch 'avination' into careminster
2012-12-18 09:48:12 +00:00
Melanie
caea7601cb
Merge branch 'master' into careminster
2012-12-18 09:45:40 +00:00
Melanie
b9939a46a1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2012-12-18 09:44:10 +00:00
Melanie
861477d85e
Fix locking for good
2012-12-18 09:32:05 +01:00
UbitUmarov
72c7f4b2eb
Merge branch 'avination' into ubitwork
2012-12-18 02:15:35 +00:00
UbitUmarov
ed9cb18cf0
missing file
2012-12-18 00:54:40 +00:00
UbitUmarov
f87af983f3
fix
2012-12-18 00:50:36 +00:00
Justin Clark-Casey (justincc)
235afebf03
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-17 22:19:42 +00:00
UbitUmarov
9089bc7e37
some clean up/fix
2012-12-17 22:11:29 +00:00
Robert Adams
8653ea93b2
BulletSim: apply friction to linear and angular motion before returning advanced motor value. This seems to be the problem with BulletSim vehicles turning too quickly. Also removed the configuration parameter that controlled the timestep scaling kludge for angular velocity that was added to research the question of quick turning.
2012-12-17 13:51:39 -08:00
Justin Clark-Casey (justincc)
e6fd8365af
Extend default 1 second wait for event completion to other thread script reset (as called by llResetOtherScript()).
...
As with script stop (via llDie()) aborting other scripts event threads, llResetOtherScript() can also abort any current event thread on another script.
On mono 2.6, 2.10 and possibly later this may cause locking problems in certain code areas.
This commit reuses the recently introduced [XEngine] WaitForEventCompletionOnScriptStop to make this a 1 sec timeout, rather than 0 secs.
2012-12-17 21:37:02 +00:00
Robert Adams
11532a4390
BulletSim: fix vehicles going underground when unsat. Problem was that, when doing unsit, the order of operations on the prims and the vehicle is very chaotic and not in a good order so the root prim was being left physical and thus it fell for a bit. Also changed default of velocity scaling to be closer to the movement standard.
2012-12-17 13:22:04 -08:00
Robert Adams
021623a17d
BulletSim: fix vehicles being shot in the air at border crossings because of mis-application of correction to postion for below groundness.
2012-12-16 22:31:22 -08:00
Robert Adams
2b8efa24dd
BulletSim: add parameter to UpdateProperties call into the linkset so changes from the physics engine can be differentiated from changes made by the user. This eliminates a linkset rebuild loop. Also add logic to not rebuild or freak out when the object/linkset crosses a terrain boundry.
2012-12-16 21:19:13 -08:00
Robert Adams
3f2aaffd4d
BulletSim: add even more to the TODO list.
2012-12-16 21:19:13 -08:00
Robert Adams
7ed860d3ac
BulletSim: add check for border crossing in character position sanity check.
2012-12-16 21:19:12 -08:00
Robert Adams
4cbc5082ff
BulletSim: refactor to combine common terrain height testing code. Add function to test if a position is over known terrain.
2012-12-16 21:19:12 -08:00
Robert Adams
8a95953bb7
BulletSim: experimentally remove unit displacement from prim border crossing test. This seems to cause border crossing to be sensed either a little early or a little late depending on which directin the object is moving. If border crossings become totally borked or someone remembers why this was displacement was done, revert this change.
2012-12-16 21:19:12 -08:00
Robert Adams
21dc5f4a1a
Add stack dump function that takes an alternate printer outter. I've found that log4net can be slowish so, if one is generating A LOT of debug output, alternate printers are better
2012-12-16 21:19:11 -08:00
Robert Adams
f3b1efd889
BulletSim: remove some errors on shutdown by moving terrain destruction until after physical object destruction. TerrainManager also made disposable and that feature used.
2012-12-16 21:19:11 -08:00
Robert Adams
ace1f1e931
BulletSim: rip out old code for linkset child position fetching. BulletSim doesn't need to do that bookkeeping because SOG/SOP already does it.
2012-12-16 21:19:10 -08:00
UbitUmarov
9d1a6558d9
*TESTP unscripted sit: missing files
2012-12-17 01:43:16 +00:00
UbitUmarov
d003aa2e7b
* TEST * unscripted sit
2012-12-17 01:40:48 +00:00
Melanie
51354bad48
Merge branch 'ubitwork' into avination
2012-12-17 02:01:47 +01:00
Melanie
a5781ea9fc
Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2012-12-17 01:59:50 +01:00
Melanie
0a876a305c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-12-16 21:19:30 +00:00
Melanie
7d8c2b342c
Fix locking objects
2012-12-16 02:05:01 +01:00
teravus
d2695cb3f7
* Fix for Prim Locking. Prior to the merge, it was just a clone of the root part to each of the child parts.
2012-12-15 16:26:03 -05:00
Justin Clark-Casey (justincc)
1a262bdde7
Make WebStatsModule properly handle scenes added or removed after initial startup.
...
This may have been the cause of the DivByZero in http://opensimulator.org/mantis/view.php?id=6460
2012-12-15 00:45:27 +00:00
Justin Clark-Casey (justincc)
494e6a5f11
minor: If the physics module tells us that an object has gone out of bounds, more helpfully log the name, id, position and region of that object.
2012-12-15 00:30:17 +00:00
Justin Clark-Casey (justincc)
56ec177b3b
minor: Add commented out log lines to ScenePresenceAnimator for future debug use (such as logging anim pack contents sent to clients)
2012-12-14 23:42:23 +00:00
Justin Clark-Casey (justincc)
2816551215
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-14 23:29:33 +00:00
Justin Clark-Casey (justincc)
750ad2d3af
Fix issue where calling llVolumeDetect(FALSE) would not remove phantom flag, causing subsequent issues if physics was re-enabled.
...
Added regression tests
Addresses http://opensimulator.org/mantis/view.php?id=6365
2012-12-14 22:15:40 +00:00
Robert Adams
664dad53dd
BulletSim: Add more to the TODO list. Clean up and improve some comments.
2012-12-13 23:08:01 -08:00
Melanie
1d713bcdb8
Merge branch 'ubitwork' into avination
2012-12-14 03:57:31 +01:00
Melanie
7a093df24b
Prevent a failed user relogi from throwing exceptions in poll services
2012-12-14 03:35:55 +01:00
Robert Adams
469c6c000a
Return the last set targetVelocity rather than the current velocity as the default action made available in PhysicsActor.TargetVelocity. Doesn't change any physics operation but makes DSG work better as the targetVelocity value does not keep moving around.
2012-12-13 16:32:25 -08:00
Robert Adams
31d3952477
BulletSim: fix problem with continuious rebuilding of physical linksets. This caused movement problems and large prim vehicles to take up a LOT of simulation time.
2012-12-13 16:32:19 -08:00
Robert Adams
60950bfab5
BulletSim: correct line endings in new BulletSimData.cs file.
2012-12-13 16:32:12 -08:00
Robert Adams
3b2b785a46
BulletSim: Add 'BulletSimData' which separates structures created
...
for the operation of BulletSim and those defintiions/structures defined
so they can be used in the unmanaged world.
Consolidate setting of collision flags so implementation is not scattered.
2012-12-13 16:32:06 -08:00
Robert Adams
9e0dd9952b
BulletSim: remove extra linkset rebuilds.
2012-12-13 16:32:00 -08:00
Justin Clark-Casey (justincc)
0b93a68030
minor: add some more detail to the logging if an LLClientView fails to process a packet
2012-12-13 23:32:28 +00:00
Justin Clark-Casey (justincc)
3c91d0e00d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-13 23:21:52 +00:00
Justin Clark-Casey (justincc)
523213060b
Add WaitForEventCompletionOnScriptStop [XEngine] config param to OpenSimDefaults.ini to allow change of the wait time for an event to complete on script removal before aborting its thread
...
Default is 1000, as has previously been the case.
This parameter exists for further debug work concerning mono 2.10 crashes that may be related to locks not being removed on Thread.Abort
2012-12-13 23:21:25 +00:00
Dan Lake
88b094cbf7
Simplify sit code a bit by determining correct animation in HandleSit instead of HandleSitRequest. This eliminates m_nextSitAnimation, an unneeded state-saving variable in ScenePresence
2012-12-13 13:05:28 -08:00
BlueWall
6f002733b1
Fix formatting
2012-12-13 13:38:57 -05:00
BlueWall (James Hughes)
5f11b4658e
Fix module pathname handling for Windows
2012-12-13 13:15:57 -05:00
UbitUmarov
5ad424a792
right fix this time ??
2012-12-13 07:48:29 +00:00
UbitUmarov
94a659a9e0
fix the 'fix'
2012-12-13 07:46:33 +00:00
UbitUmarov
c0368f4143
fix coment out code not in use
2012-12-13 07:39:10 +00:00