aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* physicsSit SendSitResponse also relative to parent primUbitUmarov2014-07-201-5/+11
|
* Merge branch 'master' into careminsterMelanie2014-01-281-49/+86
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| * Reinsert attachments list taking code in SP.MakeRootAgent()Justin Clark-Casey (justincc)2014-01-271-14/+30
| | | | | | | | Locking attachments then launching script instances on a separate thread will not work, attachments will simply be unlocked and vulnerable to race conditions.
| * refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which ↵Justin Clark-Casey (justincc)2014-01-271-2/+1
| | | | | | | | occur no matter which branch of the conditional is executed
| * Reorder checks in SP.CompleteMovement() to fix test failuresJustin Clark-Casey (justincc)2014-01-161-36/+33
| |
| * Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-161-4/+29
| |\
| | * Actually put IsChildAgent = true inside the lock, otherwise there is still a ↵Justin Clark-Casey (justincc)2014-01-161-1/+3
| | | | | | | | | | | | small window for race conditions on duplicate CompleteMovement calls
| | * Prevent duplicate invocations or race dontision in SP.CompleteMovement()Justin Clark-Casey (justincc)2014-01-161-3/+26
| | | | | | | | | | | | | | | This can happen under poor network conditions if a viewer repeats the message send If this happens, physics actors can get orphaned, which unecessarily raises physics frame times
* | | Merge branch 'master' into careminsterMelanie2014-01-281-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-081-0/+2
| |\ \ | | |/
| | * If an agent is sitting, then do send the rotation in the agent update ↵Justin Clark-Casey (justincc)2014-01-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | instead of zeroing it to resolve mouselook camera problems Addresses http://opensimulator.org/mantis/view.php?id=6892 Thanks to tglion for this spot. This resolves a recent regression from 17b32b764acd815400d9eb903aaec6dcebd60ac7
* | | Intermediate commit. Sill errors.Melanie2014-01-051-4/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| * | Eliminate unnecessary line from my previous commit 1d605642Justin Clark-Casey (justincc)2013-12-131-2/+0
| | |
| * | Refix sitting on child prims by reinserting relevant code back into ↵Justin Clark-Casey (justincc)2013-12-111-3/+22
| | | | | | | | | | | | SP.HandleAgentSit()
| * | Committing the Avination Scene Presence and related texture codeMelanie2013-12-111-352/+667
| |/ | | | | | | | | | | | | | | | | - Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements
* | Merge branch 'master' into careminsterMelanie2013-12-071-95/+170
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Fix regression where mouse look flight direction no longer worked by zeroing ↵Justin Clark-Casey (justincc)2013-12-051-13/+2
| | | | | | | | | | | | | | x/y rot before sending agent updates, instead of before any agent update processing It turns out that the x/y rot data in mouselook is needed to implement this and to push the avatar against the ground if walking in mouselook. Doing this in the terse send so that we preserve mouselook rotation information
| * Ignore X and Y body rotations when sent by mouse look.Justin Clark-Casey (justincc)2013-12-031-3/+15
| | | | | | | | | | | | | | | | Fixes http://opensimulator.org/mantis/view.php?id=3274 When not in mouselook, avatar only sends rotations around the Z plane (since that's the only way an avatar can rotate). However, in mouselook it also sends X and Y information. But sending X and Y in terse updates causes issues with wrong camera movement in mouselook. So strip out X and Y components for now. If this is an issue, then could strip out before sending avatar terse update, though this generates more cpu work. Thanks to mirceakitsune for suggesting an initial fix
| * Actually use the SP.AgentControlStopSlowWhilstMoving parameter intoroduced ↵Justin Clark-Casey (justincc)2013-11-301-1/+1
| | | | | | | | for slow walk/run in 4cfe02a rather than the magic number
| * Remove unused SP.Updated flag, which appears unused for many years and was ↵Justin Clark-Casey (justincc)2013-11-301-10/+0
| | | | | | | | only set true once and never reset
| * Implement most effects of AGENT_CONTROL_STOPJustin Clark-Casey (justincc)2013-11-301-40/+91
| | | | | | | | | | | | | | | | | | | | AGENT_CONTROL_STOP is specified to SP.HandleAgentUpdate if the user holds down the space bar on a viewer. For a stopped avatar, this prevents fly or walk/run (though not rotate) until released. For a walking/running avatar, this reduces movement to half speed. For a flying avatar, this stops the avatar. These are observed behaviours on the LL grid - there was no previous OpenSimulator implementation This commit introduces an optional parameter to SP.AddNewMovement(), which means that it will no longer compile on .NET 3.5 or earlier versions of Mono than 2.8 Currently, this does not work for jumping, and if used whilst flying the avatar continues the fly animation even though it does not move
| * Remove nudgehack from SP.HandleAgentUpdate by making MovementFlag a uint ↵Justin Clark-Casey (justincc)2013-11-301-19/+6
| | | | | | | | rather than a byte
| * Remove unused sp.ParentPosition, which has not been used for some timeJustin Clark-Casey (justincc)2013-11-291-11/+2
| |
| * Comment out debug sit message accidently left activeJustin Clark-Casey (justincc)2013-11-291-3/+3
| |
| * Fix regression where sitting on ground stopped working.Justin Clark-Casey (justincc)2013-11-291-8/+11
| | | | | | | | This was due to the PhysicsActor no longer being recreated on stand from ground.
| * Restore SP.AbsolutePosition to properly return actual absolute position when ↵Justin Clark-Casey (justincc)2013-11-291-1/+1
| | | | | | | | sitting
| * Fix stand positions rather than having the stand jump to the root prim.Justin Clark-Casey (justincc)2013-11-271-7/+49
| |
| * Only translate linked prim specified offset pos by the link prim rotation, ↵Justin Clark-Casey (justincc)2013-11-261-13/+15
| | | | | | | | | | | | not any specified avatar rotation as well. Don't translate root prim position by avatar rotation.
| * fix position changes when sitting on a prim with position and/or orientation ↵Justin Clark-Casey (justincc)2013-11-261-3/+28
| | | | | | | | explicitly specified
| * fix avatar rotation when sitting on a linked partJustin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | Need to take into account rotation of linked prim now that we are always specifying sits wrt the root prim
| * Refix fix for sitting on non-root linked prims with explicit sit targets.Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | I forgot that m_post is being set inconsistently between non-explicit and explicit ragets
| * Fix non-root prim sit positions for prims where a sit target has been ↵Justin Clark-Casey (justincc)2013-11-231-1/+1
| | | | | | | | specified as well.
| * Add line accidentally left out of recent non-root prim sit fixJustin Clark-Casey (justincc)2013-11-231-0/+2
| | | | | | | | Original commit is ff4e7de7
| * Fix issue where sitting on non-root linked prims would send camera to wrong ↵Justin Clark-Casey (justincc)2013-11-231-2/+7
| | | | | | | | | | | | position in third-person and mouselook We now specify sits as offsets from the root prim, as the viewer expects.
* | Merge branch 'master' into careminsterMelanie2013-10-041-15/+48
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * minor: Add scene name to baked textures in cache log messageJustin Clark-Casey (justincc)2013-09-261-1/+1
| |
| * Lock around read/write of ScenePresence.m_originRegionID to make sure that ↵Justin Clark-Casey (justincc)2013-09-201-5/+33
| | | | | | | | | | | | all threads are seeing the latest value and not a cached one. There is a possibilty that some V2 teleport failures are due to the viewer triggered CompleteMovement thread not seeing the change of m_originRegionID by the UpdateAgent thread.
| * minor: Make SP.MakeRootAgent() private - no external code has any business ↵Justin Clark-Casey (justincc)2013-09-191-1/+1
| | | | | | | | calling this method
| * minor: Make log message at top of ScenePresence.CompleteMovement info level ↵Justin Clark-Casey (justincc)2013-09-191-5/+5
| | | | | | | | | | | | | | and comment out later log message in ScenePresence.MakeRootAgent() Need an info message since this is currently important in detecting teleport issue when not at debug log level. CompleteMovement message occurs before MakeRootAgent() one did
| * minor: correct method name in commentJustin Clark-Casey (justincc)2013-09-181-1/+1
| |
| * refactor: rename *ChildAgentDataUpdate() methods to *UpdateChildAgent()Justin Clark-Casey (justincc)2013-09-181-2/+3
| | | | | | | | verb-noun is consistent with other similar methods
| * minor: Make log message when Scene.IncomingChildAgentDateUpdate() more ↵Justin Clark-Casey (justincc)2013-09-181-1/+4
| | | | | | | | | | | | | | explicit that there is a problem if it still finds the agent to be a child if the sender wanted to wait till it became root Add some comments about the mssage sequence, though much more data is at http://opensimulator.org/wiki/Teleports
* | Merge branch 'avination-current' into careminsterMelanie2013-09-161-4/+5
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| * | Mono 2.0 fix - call ToArray() explicitlyMelanie2013-09-081-4/+5
| | |
* | | Merge branch 'master' into careminsterMelanie2013-09-011-5/+6
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Remove old and unused ScenePresence.RestoreInCurrentScene()Justin Clark-Casey (justincc)2013-08-231-5/+0
| | |
| * | Don't allow users to attempt to sit on objects in a child region without ↵Justin Clark-Casey (justincc)2013-08-211-0/+9
| | | | | | | | | | | | | | | | | | | | | going to that region first. If this is attempted, they get a "Try moving closer. Can't sit on object because it is not in the same region as you." message instead, which is the same as current ll grid. Sitting on ground is okay, since viewer navigates avatar to required region first before sitting.
* | | Merge branch 'master' into careminsterMelanie2013-08-171-4/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| * | minor: remove mono compiler warnings from ScenePresenceJustin Clark-Casey (justincc)2013-08-171-4/+3
| | |
* | | Merge branch 'master' into careminsterMelanie2013-08-111-7/+34
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs