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
6602dee2fc
Merge branch 'master' into careminster
2012-04-14 01:54:24 +01:00
da342d0b21
minor: make test names consistent
2012-04-14 01:53:40 +01:00
f61b234252
refactor: move common init code into SetUp() in SceneObjectSpatialTests
2012-04-14 01:52:16 +01:00
919972a440
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
2012-04-14 01:51:20 +01:00
317aebcce6
refactor: put SOG position test in a separate TestSceneObjectGroupPosition()
2012-04-14 01:47:56 +01:00
40d01fb20b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-14 01:43:57 +01:00
3ae98611f2
Add simple RelativePosition and OffsetPosition checks to TestGetRootPartPosition
2012-04-14 01:43:03 +01:00
e8898710d5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-04-14 01:14:43 +01:00
2254a718c8
Add Talun to the CONTRIBUTORS.txt, Thank you for the great patches
...
Talun
2012-04-13 17:09:23 -07:00
4d652c7041
Missing or unimplemented LSL memory functions.
...
Implemented to behave as if scripts were LSO.
Signed-off-by: nebadon <michael@osgrid.org>
2012-04-13 17:08:00 -07:00
4bdd9d51bc
Correct whitespace error introduced by previous commit
2012-04-14 01:04:26 +01:00
eeec1f32c6
Add very basic TestGetRootPartPosition() test
2012-04-14 01:01:28 +01:00
a366c05ae2
Added ability to exclude inventory items or folders when saving IAR files.
2012-04-13 23:31:12 +01:00
47ba9d9429
Merge branch 'master' into careminster
2012-04-13 23:29:10 +01:00
eced091689
Change threat level of osNpcStopMoveToTarget from Low to High to match other NPC functions, and change OSSL permissions name to osNpcStopMoveToTarget instead of osNpcStopMoveTo
...
Thanks to Oren Hurvitz for pointing out these mistakes.
2012-04-13 22:52:24 +01:00
1ad3fdb40b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-13 22:34:36 +01:00
ab7c0e7547
Remove hardcoded god requirement from osSetRegionWaterHeight, osSetRegionSunSettings and, osSetEstateSunSettings no matter the threat level.
...
Change threat level on osSetRegionSunSettings and osSetEstateSunSettings from nuisance to high to match similar functions.
If you had enabled these functions but had relied on the hardcoded god check in the code, then please adjust your OSSL permissions config.
Thanks to Oren Hurvitz for pointing this out.
2012-04-13 22:32:33 +01:00
b574d43c5d
Use presence absolute position to request raycast to camera. Used m_pos maybe a sitting offset. For reasons i don't understand that also seems to crash ode more when i let this rays colide with heighmaps (ubitODE with normal ode lib).
2012-04-13 20:34:56 +01:00
5da77e047a
don't do Animator.UpdateMovementAnimations() in scenepresence RegionHeartbeatEnd if agent is sitting. Also restore Velocity in teleportWithMomentum()
2012-04-13 17:50:03 +01:00
5e3a76361f
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-13 03:03:44 +01:00
fe65b51876
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-04-13 03:00:48 +01:00
08e509978d
Mantis 55025 Implement script time.
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-04-12 18:44:00 -07:00
30d8506bc2
make changes to FlotsamCache.ini.example as noted in mantis #5960
...
http://opensimulator.org/mantis/view.php?id=5960
2012-04-12 18:27:14 -07:00
4a67e8b98f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IEstateModule.cs
2012-04-11 23:35:27 +01:00
8be14095fe
HGFriendsModule: Type casts to fix compile error
2012-04-11 18:56:28 +02:00
1f4d3d3582
HGFriendsModule: Added optional user level based restriction to send friendship invitations to foreign users.
2012-04-11 18:52:07 +02:00
f2ede8c7e0
HGFriendsModule: add the scaffolding for supporting permissions pertaining to HG friendships. Snoopy take it from here.
2012-04-11 08:13:11 -07:00
Melanie