aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-051-13/+56
|\ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Mantis 60004 problems with damage and llSetDamage. In damage enabled areas ↵Talun2012-05-041-7/+46
| | | | | | | | this patch - Deletes any objects that have damage set > 0 that deliver that damage to an avatar Stops Gods receiving damage, Stops volume detect objects causing damage Deletes NPCS when their helth reduces to zero Gradually "heals" damage to an avatar Resets health on going to a non damage area
| * Reinsert a 2000ms delay before closing a no longer required agent on the ↵Justin Clark-Casey (justincc)2012-05-031-4/+10
| | | | | | | | | | | | | | | | | | source region after teleport to resolve Imprudence teleport problems. Viewers 1 and 3 are fine with doing this immediately. However, Imprudence has a small delay (<200ms, >500ms) after receiving the AgentCompleteMovement reply packet on the destination region before regarding that region as the currnet region. If Imprudence receives a DisableSimulator in this period, it quits. We are not restoring the full 5000ms delay since this brings back a bug where teleports permanently fail if an avatar tries to teleport back too quickly. This commit also sends the AgentCompleteMovement packet to the client before telling the source region to release its old agent, in order to further cut down any possibility of the DisableSimulator being recieved before the AgentMovementComplete.
* | Merge branch 'master' into careminsterMelanie2012-05-021-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * Add regression test for teleporting between neighbouring regions on the same ↵Justin Clark-Casey (justincc)2012-05-011-2/+2
| | | | | | | | | | | | | | simulator This adds a non-advertised wait_for_callback option in [EntityTransfer]. Default is always true. Teleport tests disable the wait for callback from the destination region in order to run within a single thread.
* | Merge branch 'master' into careminsterMelanie2012-04-301-67/+75
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/MySQLUserAccountData.cs
| * refactor: Simplify by combining SafeSendControlsToScripts() from fe8e835 ↵Justin Clark-Casey (justincc)2012-04-301-73/+75
| | | | | | | | into SendControlsToScripts() (instead of SendControlToScripts()).
| * Fixed: scripted controls didn't work if the avatar was sitting downOren Hurvitz2012-04-301-9/+15
| | | | | | | | This fixes a bug introduced in 6473674bbf6ce006512083902e8ff1796d8c8b22
* | Merge branch 'avination'Melanie2012-04-291-0/+35
|\ \
| * | testUbitUmarov2012-04-271-3/+0
| | |
| * | testUbitUmarov2012-04-271-12/+9
| | |
| * | testUbitUmarov2012-04-271-1/+1
| | |
| * | itestUbitUmarov2012-04-271-2/+3
| | |
| * | itestUbitUmarov2012-04-271-2/+5
| | |
| * | testUbitUmarov2012-04-271-2/+2
| | |
| * | testing....UbitUmarov2012-04-271-15/+24
| | |
| * | testingUbitUmarov2012-04-271-1/+1
| | |
| * | TESTINGUbitUmarov2012-04-271-4/+4
| | |
| * | TEST more changesUbitUmarov2012-04-271-1/+2
| | |
| * | TEST more options to avnLocalTeleportUbitUmarov2012-04-271-4/+9
| | |
| * | TEST added avnLocalTeleport(Vector3 newpos, Quaternion? newrot, bool ↵UbitUmarov2012-04-271-0/+22
| | | | | | | | | | | | Stopped) to scenepresence.cs
* | | Merge branch 'master' into careminsterMelanie2012-04-271-14/+19
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * | Fixed: custom walking animations didn't stop when the avatar stopped walking.Oren Hurvitz2012-04-271-14/+19
| | | | | | | | | | | | | | | | | | This happened because the scripts were notified about control changes (e.g., the user stopped pressing the Forward key) when the animation was still WALK, so the script didn't stop the walking animation. Fixing this required: a) Update the movement animation *before* notifying the script; b) Add locking to prevent clashes with the Heartbeat thread (which also updates the animations); c) Handle the case of a user who stops walking just as the avatar is in the air: the avatar should STAND in that case, not WALK. This reverts commit feef1dd73243cfdd5322632fb67e64cabc1ad4bc.
* | | Merge branch 'master' into careminsterMelanie2012-04-271-1/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Tweak log messages on local region to region teleport path to help with ↵Justin Clark-Casey (justincc)2012-04-261-1/+4
| | | | | | | | | | | | problem resolution.
| * | Comment out avatar move to target message for now.Justin Clark-Casey (justincc)2012-04-251-3/+3
| | |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-251-1/+1
|\ \ \ | | |/ | |/| | | | careminster
| * | fix animations if sited in ground alsoUbitUmarov2012-04-241-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-251-5/+0
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Commit the avination Teleport() methods (adaptedto justincc's changes)Melanie2012-04-251-1/+12
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-251-8/+1
|\ \ \ | |/ / | | | | | | | | | 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-251-0/+6
| | |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-231-2/+5
|\ \ \ | | |/ | |/| | | | careminster
| * | fix a bug i added fixing another....UbitUmarov2012-04-221-2/+5
| | |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-201-1/+11
|\ \ \ | |/ / | | | | | | careminster
| * | Allow setting a specific target velocity on TeleportWithMomentumMelanie2012-04-181-1/+11
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-171-3/+3
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | 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-171-3/+14
|\ \ \ | | |/ | |/| | | | careminster
| * | 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-131-0/+19
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | Mantis 55025 Implement script time.Talun2012-04-121-0/+19
| | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org>
* | | Merge branch 'master' into careminsterMelanie2012-04-091-0/+38
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/Framework/Interfaces/IScriptModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Mantis5502 implementation of some of the new constantsTalun2012-04-091-0/+38
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2012-04-071-0/+16
|\ \ | |/ | | | | | | | | | | | | | | 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
| * For llGetMass(), return the mass of the avatar is the object is attached.Justin Clark-Casey (justincc)2012-04-061-0/+16
| | | | | | | | | | As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass This is the mass as used by the physics engine (ODE or Bullet).
* | Merge branch 'master' into careminsterMelanie2012-03-291-16/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
generated by cgit v1.1 at 2025-02-02 01:20:42 +0000