2b98e2f106
Stop teleports from dropping tall avatars through or embedding them in the floor when lured by short avatars.
...
This involves giving the ceiling of the Z-component in a lure rather than the floor.
Ideally we would give the exact float compensating for relative avatar height but it looks like that isn't possible with the parcel id format used in lures
2012-04-20 02:50:36 +01:00
65b3e13010
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-20 00:17:14 +01:00
aeb5aed5b7
changed - VolumeDetect and phantom setting interaction. Script VD(true) forces phantom ON. UI phantom off turns off VD. Other transitions should only change specific parameter. This is not as current SL. - Fixed volumedetect prims being wrongly removed from physics.
2012-04-19 23:01:22 +01:00
9b02e1cf4a
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-04-19 01:52:23 +01:00
beb7b8d189
Fix a logic error in app domain creation
2012-04-18 23:23:37 +01:00
c2be894330
Fx up estate settings
2012-04-18 23:23:01 +01:00
411bd0574d
Allow setting a specific target velocity on TeleportWithMomentum
2012-04-18 22:16:59 +02:00
525b7593e8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-04-18 20:09:52 +01:00
7a255efdb2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-04-18 20:07:32 +01:00
ea73a03553
Don't re-add the assembly resolver for each script if not creating the appdomain
2012-04-18 20:01:41 +01:00
5936e0c376
Allow scripts in attachments owned by the NPC to control the NPC
2012-04-18 19:51:27 +02:00
08714a0d38
ubitODE still retouching character pid
2012-04-18 03:59:38 +01:00
7f42069295
ubitODE - retouch character PIDs
2012-04-18 03:02:28 +01:00
c85f9d681a
On "show part" command, show link number.
...
This replaces the Parts count which was rather pointless for a prim (it was either 1 if a child or the number of parts if the root).
This information is still avaliable on the "show object" command.
2012-04-18 00:39:39 +01:00
fc9f244a7d
Merge branch 'master' into careminster
2012-04-18 00:28:33 +01:00
b430c0162c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-18 00:00:09 +01:00
859646ef5c
minor: Add some method doc. Add warnings since calling SOG link/delink methods directly rather than through Scene may allow race conditions.
2012-04-17 23:54:51 +01:00
0fe0b2ceec
Prevent objects rezzed in sim from being seen as attachments and becoming uneditable or crashers. (Foxtail of death)
2012-04-17 23:39:41 +02:00
84891930aa
clean up some more logging spam in the jsonstore modules
2012-04-17 14:23:43 -07:00
4db518b9a3
Fix the Csharp 3.0 vs 4.0 problem in JsonStore initialization.
...
Cut down on the logging spam.
2012-04-17 14:15:17 -07:00
2d45ba47ac
add configuration for jsonstore module, disabled by default
2012-04-17 13:55:00 -07:00
5ff2bda587
This commit adds a new optional region module, JsonStore, that provides structured
...
storage (dictionaries and arrays of string values) for scripts and region modules.
In addition, there are operations on the storage that enable "real" distributed
computation between scripts through operations similar to those of a tuple space.
Scripts can share task queues, implement shared locks or semaphores, etc.
The structured store is limited to the current region and is not currently
persisted. However, script operations are defined to initialize a store from a notecard
and to serialize the store to a notecard.
Documentation will be posted to the opensim wiki soon.
2012-04-17 13:45:27 -07:00
4bb72c9ffe
make the namespace for the ScriptModuleComms consistent with its file system location
2012-04-17 13:45:03 -07:00
9464fcebcd
ubitODE: prims - update managed dinamic parameters from unmanaged at ODE rate and not heartbeat.
2012-04-17 16:49:08 +01:00
9132c9e499
ubitODE: - character managed ode was only getting position etc from unmanaged at heartbeat rate like core ode. Now do it at ODE rate in move(..). UpdatePositionAndVelocity() called once per heartbeat is now empty.
2012-04-17 15:50:14 +01:00
d7e2454281
ubitODE: - made avatar/ground collision pid servo a bit softer since seems a bit unstable with small avas in AVI even if fine on my testsite - Removed reading of PID parameters from config files since that only serves to mess things up and adds more unknowns
2012-04-17 14:24:13 +01:00
cca6b6bd0d
Add TestGetChildPartPositionAfterObjectRotation()
2012-04-17 02:14:10 +01:00
74aa8eee12
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-17 01:54:54 +01:00
2f2181683c
Add test TestGetChildPartPosition()
2012-04-17 01:51:13 +01:00
ab1a3688e2
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-17 01:50:49 +01:00
7e1ab216e3
Move some public methods on WebStatsModule to private to reduce some static analysis complexity.
...
There's no obvious reason for these methods to be public.
2012-04-17 01:33:55 +01:00
24a0cc5261
refactor: Rename EstateSettings.IsEstateManager() to EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does.
...
This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities.
As per opensim-dev mailing list.
2012-04-17 01:25:41 +01:00
36207b88ff
ubitODE: bug fix let avatars colide with volume detectors
2012-04-17 01:00:50 +01:00
5655239f44
Null reference in llGetObjectMass on a seated avatar.
2012-04-17 00:56:46 +01:00
e6ec83125b
Use INSERT OR REPLACE INTO sql in WebStatsModule for session update rather than separate insert and update statements
2012-04-17 00:46:43 +01:00
572440cd23
correct bug where f_invalid was being inserted on a webstats update for an existing session rather than d_world_kb
2012-04-17 00:33:23 +01:00
1bb3873338
Simplify WebStatsModule by removing the uncompleted migrations section.
...
Use "create table if not exists" instead.
Client stats data is transitory data that it is not worth migrating.
2012-04-17 00:19:36 +01:00
f213f55586
Fix bug in WebStatsModule where an exception would always be output on update if the user teleported to another region on that simulator.
...
This was because update was looking for an existing stats record unique in session id, agent id and region id.
But if the user teleports to another region then region id changes.
WebStatsModule promptly doesn't find the existing record and tries to insert a new one, but only session id is the primary key and that's still the same, which makes things go bang.
This makes the update search only on the unique session id.
This is only an issue with simulators that have multiple regions where the webstats module is enabled.
2012-04-17 00:02:58 +01:00
d30b18b1de
Merge branch 'ubitwork'
2012-04-17 00:09:04 +02:00
723015e4f0
fix ( http://opensimulator.org/mantis/view.php?id=5965 ) llGetObjectMass was bad for sitted avatars not checking for the null physicsactor
2012-04-16 21:58:25 +01:00
6480b72eda
ubitODE: - fix remove characters from default raycasts filters as older code (or camera is very odd) - Slow down avatar if velocity is higher than 50m/s as in chODE
2012-04-16 19:44:02 +01:00
adb629a416
Merge branch 'ubitwork'
2012-04-16 20:02:15 +02:00
fff5c61ae8
chODE: if character velocity > 50m/s apply breaks. In free fall this will give a terminal velocity +- 60m/s
2012-04-16 17:47:17 +01:00
04ed5519a5
chODE bug fix
2012-04-16 17:14:31 +01:00
f05a977afa
Let llCastRay use ubitODE raycast if avaiable plus a few changes/fixes that should be checked. PROBLEM: it will not detect nonphysical phantons :(
2012-04-16 16:35:35 +01:00
25a2f97bc2
added suport funtions for ubitODE raycastFiltered
2012-04-16 16:33:57 +01:00
03139f07d7
Downgrade an error log message to info because there is nothing we can do if
...
an asset is damaged so it should not spew red ink.
2012-04-16 17:32:30 +02:00
86a2169d73
ubitODE + physmanager: - Revised use of ODE collisions categories and bits(flags) for better use as filters together with top spaces (for example physical prims are on topactivespace and not physical are on topstaticspace) - Added new world raycast with filters. This blocks calling thread with a timeout of 500ms waiting for heartbeat ode thread signal job done. - Don't let ode bodies being disabled for 2 long except for vehicles. This is necessary to detect when the object is at rest at top of other and that is removed. Assume that vehicles can be enabled by used action.
2012-04-16 16:16:55 +01:00
3999822e13
Use chode character actor.SetMomentum() to force full restore Velocity in scenepresence TeleportWithMomentum(), since actor.Velocity was selected by original coders as the input of a desired velocity (even 'forces') that is modified by character conditions, like not changing velocity.Z if it is in free fall.
2012-04-14 05:07:52 +01:00
2c74e1bba8
Add GroupPosition and GetWorldPosition() checks to TestGetRootPartPosition()
2012-04-14 01:57:09 +01:00
Justin Clark-Casey (justincc)