aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-1711-139/+76
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add test TestGetChildPartPosition()Justin Clark-Casey (justincc)2012-04-171-0/+28
| |
| * Move some public methods on WebStatsModule to private to reduce some static ↵Justin Clark-Casey (justincc)2012-04-171-14/+14
| | | | | | | | | | | | analysis complexity. There's no obvious reason for these methods to be public.
| * refactor: Rename EstateSettings.IsEstateManager() to ↵Justin Clark-Casey (justincc)2012-04-179-16/+16
| | | | | | | | | | | | | | 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.
| * Null reference in llGetObjectMass on a seated avatar.Talun2012-04-171-1/+1
| |
| * Use INSERT OR REPLACE INTO sql in WebStatsModule for session update rather ↵Justin Clark-Casey (justincc)2012-04-171-77/+7
| | | | | | | | than separate insert and update statements
| * correct bug where f_invalid was being inserted on a webstats update for an ↵Justin Clark-Casey (justincc)2012-04-171-2/+2
| | | | | | | | existing session rather than d_world_kb
| * Simplify WebStatsModule by removing the uncompleted migrations section.Justin Clark-Casey (justincc)2012-04-171-29/+3
| | | | | | | | | | Use "create table if not exists" instead. Client stats data is transitory data that it is not worth migrating.
| * Fix bug in WebStatsModule where an exception would always be output on ↵Justin Clark-Casey (justincc)2012-04-171-5/+10
| | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-1713-766/+1167
|\ \ | | | | | | | | | careminster
| * \ Merge branch 'ubitwork'Melanie2012-04-172-2/+24
| |\ \
| | * | ubitODE: bug fix let avatars colide with volume detectorsUbitUmarov2012-04-171-0/+1
| | | |
| | * | fix (http://opensimulator.org/mantis/view.php?id=5965) llGetObjectMass was ↵UbitUmarov2012-04-161-2/+23
| | | | | | | | | | | | | | | | bad for sitted avatars not checking for the null physicsactor
| * | | Merge branch 'ubitwork'Melanie2012-04-162-8/+16
| |\ \ \ | | |/ /
| | * | ubitODE: - fix remove characters from default raycasts filters as older code ↵UbitUmarov2012-04-162-8/+16
| | | | | | | | | | | | | | | | (or camera is very odd) - Slow down avatar if velocity is higher than 50m/s as in chODE
| * | | Downgrade an error log message to info because there is nothing we can do ifMelanie2012-04-162-2/+2
| |/ / | | | | | | | | | an asset is damaged so it should not spew red ink.
| * | chODE: if character velocity > 50m/s apply breaks. In free fall this will ↵UbitUmarov2012-04-161-1/+10
| | | | | | | | | | | | give a terminal velocity +- 60m/s
| * | chODE bug fixUbitUmarov2012-04-161-7/+9
| | |
| * | Let llCastRay use ubitODE raycast if avaiable plus a few changes/fixes that ↵UbitUmarov2012-04-161-22/+86
| | | | | | | | | | | | should be checked. PROBLEM: it will not detect nonphysical phantons :(
| * | added suport funtions for ubitODE raycastFilteredUbitUmarov2012-04-161-0/+13
| | |
| * | ubitODE + physmanager: - Revised use of ODE collisions categories and ↵UbitUmarov2012-04-167-729/+983
| | | | | | | | | | | | 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.
| * | Use chode character actor.SetMomentum() to force full restore Velocity in ↵UbitUmarov2012-04-142-2/+22
| | | | | | | | | | | | 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.
| * | Use presence absolute position to request raycast to camera. Used m_pos ↵UbitUmarov2012-04-131-3/+11
| | | | | | | | | | | | 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).
| * | don't do Animator.UpdateMovementAnimations() in scenepresence ↵UbitUmarov2012-04-131-2/+3
| | | | | | | | | | | | RegionHeartbeatEnd if agent is sitting. Also restore Velocity in teleportWithMomentum()
* | | Merge branch 'master' into careminsterMelanie2012-04-141-5/+30
|\ \ \ | | |/ | |/|
| * | Add GroupPosition and GetWorldPosition() checks to TestGetRootPartPosition()Justin Clark-Casey (justincc)2012-04-141-1/+3
| | |
| * | minor: make test names consistentJustin Clark-Casey (justincc)2012-04-141-1/+1
| | |
| * | refactor: move common init code into SetUp() in SceneObjectSpatialTestsJustin Clark-Casey (justincc)2012-04-141-8/+13
| | |
| * | refactor: put SOG position test in a separate TestSceneObjectGroupPosition()Justin Clark-Casey (justincc)2012-04-141-1/+17
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-145-12/+62
| |\ \
| * | | Add simple RelativePosition and OffsetPosition checks to TestGetRootPartPositionJustin Clark-Casey (justincc)2012-04-141-0/+2
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-04-148-95/+250
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-04-141-0/+1
| |\ \ \
| | * | | Add Talun to the CONTRIBUTORS.txt, Thank you for the great patchesnebadon2012-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | Talun
| * | | | Correct whitespace error introduced by previous commitMelanie2012-04-141-1/+1
| |/ / /
| * | | Missing or unimplemented LSL memory functions.Talun2012-04-134-13/+62
| |/ / | | | | | | | | | | | | | | | Implemented to behave as if scripts were LSO. Signed-off-by: nebadon <michael@osgrid.org>
| * | Add very basic TestGetRootPartPosition() testJustin Clark-Casey (justincc)2012-04-141-0/+65
| | |
| * | Added ability to exclude inventory items or folders when saving IAR files.Kevin Cozens2012-04-132-84/+128
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-131-37/+26
|\ \ \ | |/ /
| * | Change threat level of osNpcStopMoveToTarget from Low to High to match other ↵Justin Clark-Casey (justincc)2012-04-131-1/+1
| | | | | | | | | | | | | | | | | | NPC functions, and change OSSL permissions name to osNpcStopMoveToTarget instead of osNpcStopMoveTo Thanks to Oren Hurvitz for pointing out these mistakes.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-1317-52/+277
| |\ \
| * | | Remove hardcoded god requirement from osSetRegionWaterHeight, ↵Justin Clark-Casey (justincc)2012-04-131-36/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-139-351/+541
|\ \ \ \ | | |_|/ | |/| | | | | | careminster
| * | | make llGetGeometricCenter() work as in current SL. Now this is not real geom ↵UbitUmarov2012-04-092-10/+49
| | | | | | | | | | | | | | | | center but a average of positions relative to root prim ignoring prims details, so no need to use physics engine.
| * | | chODE and ubitODE always return prim mass (they where returning object mass ↵UbitUmarov2012-04-094-69/+315
| | | | | | | | | | | | | | | | on physical prims) so SOG can do the total add. (ubitODE as more code to use a simpler terrain geom on a modified ode lib but should do autodetect and work with normal lib).
| * | | llGetMass and llGetObjectMass (and push estimation) always use object mass ↵UbitUmarov2012-04-093-9/+30
| | | | | | | | | | | | | | | | as in current SL ( push is what makes sense or impulse will depend on what prim it is and not object). Added llGetMassMKS() that just returns 100 x llGetMass() as it seems to be in SL.
| * | | sop.AddToPhysics(..) fixed and in use. For now it seems it needs to set ↵UbitUmarov2012-04-091-263/+147
| | | | | | | | | | | | | | | | sop.PhysActor, so made it return void.
* | | | Merge branch 'master' into careminsterMelanie2012-04-138-109/+178
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | | Mantis 55025 Implement script time.Talun2012-04-127-46/+135
| | | | | | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org>
| * | | make changes to FlotsamCache.ini.example as noted in mantis #5960nebadon2012-04-121-2/+2
| | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5960
generated by cgit v1.1 at 2024-10-19 13:42:48 +0000