aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'master' into careminsterMelanie2012-04-252-8/+37
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()Justin Clark-Casey (justincc)2012-04-251-16/+0
| | | | | | | | | | | | These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene.
| * | Add regression test TestSameRegionTeleport()Justin Clark-Casey (justincc)2012-04-252-0/+42
| | |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-234-26/+109
|\ \ \ | | |/ | |/| | | | careminster
| * | fix a bug i added fixing another....UbitUmarov2012-04-221-2/+5
| | |
| * | changed seletion code. SOP now knows about parts selection. UI actions are ↵UbitUmarov2012-04-203-24/+104
| | | | | | | | | | | | sent to SOP and this reports to SOG. Group is selected if any part is selected.sop.isSelect get() is only used in SOG. Will need to be improved for better performance on largelinksets. *UNTESTED* NEEDS CHECKING for side efects
* | | Merge branch 'master' into careminsterMelanie2012-04-235-13/+32
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Mantis 5977 Corrections to llRegionSayToTalun2012-04-231-3/+23
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Make TestSetPhysicsSinglePrim() actually add the object to the scene in ↵Justin Clark-Casey (justincc)2012-04-221-0/+2
| | | | | | | | | | | | order to test more code paths.
| * | Fix bug where setting phantom on a prim would result in a server log message ↵Justin Clark-Casey (justincc)2012-04-223-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | rather than setting phantom. This was an oversight when removing some race conditions from PhysicsActor setting recently. Regression tests extended to probe this code path. Extending regression tests required implementation of a BasicPhysicsPrim (there was none before). However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing.
* | | Merge branch 'master' into careminsterMelanie2012-04-223-9/+129
|\ \ \ | |/ /
| * | Add test for setting physics in a linksetJustin Clark-Casey (justincc)2012-04-211-2/+28
| | |
| * | Add regression test for prim status when root prim in a new linkset is ↵Justin Clark-Casey (justincc)2012-04-212-1/+20
| | | | | | | | | | | | non-physical
| * | Fix a bug where linking a non-physical prim with a physical prim as root ↵Justin Clark-Casey (justincc)2012-04-212-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | would make the non-physical prim phantom rather than part of the physics object. On region restart, the whole object would become physical as expected. Observed behaviour from elsewhere is that all prims in a new linkset should take on the status of the root prim. Add regression test for this behaviour.
| * | Add test for correct physics status on linking two physics objectsJustin Clark-Casey (justincc)2012-04-211-2/+26
| | | | | | | | | | | | Also fixes last build break.
| * | refactor: extract common setup code in SceneObjectStatusTestsJustin Clark-Casey (justincc)2012-04-211-10/+16
| | |
| * | Add TestSetPhysics() to SOP status testsJustin Clark-Casey (justincc)2012-04-212-3/+26
| | |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-204-14/+57
|\ \ \ | | |/ | |/| | | | careminster
| * | changed - VolumeDetect and phantom setting interaction. Script VD(true) ↵UbitUmarov2012-04-192-13/+40
| | | | | | | | | | | | 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.
| * | Allow setting a specific target velocity on TeleportWithMomentumMelanie2012-04-181-1/+11
| | |
| * | Prevent objects rezzed in sim from being seen as attachments and becoming ↵Melanie2012-04-171-0/+6
| | | | | | | | | | | | uneditable or crashers. (Foxtail of death)
* | | Merge branch 'master' into careminsterMelanie2012-04-183-1/+59
|\ \ \ | | |/ | |/|
| * | minor: Add some method doc. Add warnings since calling SOG link/delink ↵Justin Clark-Casey (justincc)2012-04-172-0/+22
| | | | | | | | | | | | methods directly rather than through Scene may allow race conditions.
| * | Add TestGetChildPartPositionAfterObjectRotation()Justin Clark-Casey (justincc)2012-04-171-1/+37
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-172-3/+31
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Add test TestGetChildPartPosition()Justin Clark-Casey (justincc)2012-04-171-0/+28
| | |
| * | refactor: Rename EstateSettings.IsEstateManager() to ↵Justin Clark-Casey (justincc)2012-04-171-3/+3
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-172-3/+27
|\ \ \ | | |/ | |/| | | | careminster
| * | added suport funtions for ubitODE raycastFilteredUbitUmarov2012-04-161-0/+13
| | |
| * | Use chode character actor.SetMomentum() to force full restore Velocity in ↵UbitUmarov2012-04-141-1/+3
| | | | | | | | | | | | 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
| | |
| * | Add simple RelativePosition and OffsetPosition checks to TestGetRootPartPositionJustin Clark-Casey (justincc)2012-04-141-0/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-141-0/+65
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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
| * | Add very basic TestGetRootPartPosition() testJustin Clark-Casey (justincc)2012-04-141-0/+65
| | |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-132-273/+196
|\ \ \ | | |/ | |/| | | | 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.
| * | 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-133-68/+106
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | Mantis 55025 Implement script time.Talun2012-04-123-7/+65
| | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org>
* | | Merge branch 'master' into careminsterMelanie2012-04-094-2/+118
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/Framework/Interfaces/IScriptModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Mantis5502 implementation of some of the new constantsTalun2012-04-093-2/+115
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * Addresses mantis #5846Diva Canto2012-04-081-1/+3
| |
* | Merge branch 'master' into careminsterMelanie2012-04-076-59/+218
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-064-97/+128
| |\