aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-01-101-58/+70
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Remove now superfluous update of m_lastSizeMelanie2013-01-081-3/+0
| |
| * Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2013-01-081-0/+2
| |\
| | * also update m_lastSize in SendAvatarDataToAllAgents so more paths updateUbitUmarov2013-01-081-0/+2
| | | | | | | | | | | | it
| | * Revert "Remove sending AvatarData because this also happens on login, where ↵Melanie2013-01-081-1/+9
| | | | | | | | | | | | | | | | | | it chokes" This reverts commit d1fa650c3f16ee74cd39d9258c5ef7aa4869ca03.
| | * Merge branch 'ubitwork' into avinationMelanie2013-01-081-45/+61
| | |\
| | * | Remove sending AvatarData because this also happens on login, where it chokesMelanie2013-01-081-9/+1
| | | | | | | | | | | | | | | | Firestorm, Singularity and other viewers with the new appearance pipeline.
| * | | Prevent avatar data from being sent during login when it's not valid andMelanie2013-01-081-2/+5
| | |/ | |/| | | | | | | crashes login on some viewers.
| * | put back position and rot change check before sending releasing plane constrainUbitUmarov2013-01-081-4/+7
| | |
| * | reduce sampling of camera raycasts to previus valueUbitUmarov2013-01-081-23/+26
| | |
| * | * DAnger, TEST * change camera plane collision detection. Still bounces onUbitUmarov2013-01-081-49/+59
| |/ | | | | | | * prim edges due to camera lag
| * in raycast for camera exclude self detectionUbitUmarov2013-01-071-3/+2
| |
* | Merge branch 'avination' into careminsterMelanie2013-01-061-51/+111
|\ \ | |/
| * check land permitions on sit target for unscripted sitsUbitUmarov2013-01-031-0/+17
| |
| * make ResetMoveToTarget cancel any 'force' waiting to be applied to avatarUbitUmarov2013-01-031-7/+2
| | | | | | | | ( by the odd use of Velocity)
| * cancel MoveToTarget (viewer 'go here") on sitsUbitUmarov2013-01-031-2/+22
| |
| * *TEST* avatar unscripted sit. Some guessing/automationUbitUmarov2013-01-021-2/+4
| |
| * Merge branch 'ubitwork' into avinationMelanie2012-12-221-47/+46
| |\
| | * some clean up/fixUbitUmarov2012-12-171-47/+46
| | |
| * | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-211-10/+17
| | | | | | | | | | | | Cached Bakes.
| * | * Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to ↵teravus2012-12-191-0/+20
| |/ | | | | | | synchronize with Agni.
* | Merge branch 'master' into careminsterMelanie2012-12-301-2/+2
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | ScenePresence passes the avatar rotation down to the physics engine. This ↵Robert Adams2012-12-281-0/+4
| | | | | | | | | | | | will be a no-op for ODE but enables asymmetrical avatars for BulletSim.
* | | Merge branch 'master' into careminsterMelanie2012-12-281-3/+8
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Add check to always push terse updates for presences that have new ↵Robert Adams2012-12-271-3/+8
| | | | | | | | | | | | velocities of zero.
* | | Merge branch 'avination' into careminsterMelanie2012-12-181-183/+120
|\ \ \ | | |/ | |/|
| * | * TEST * unscripted sitUbitUmarov2012-12-171-174/+48
| | |
| * | right fix this time ??UbitUmarov2012-12-131-1/+1
| | |
| * | fix the 'fix'UbitUmarov2012-12-131-2/+2
| | |
| * | fix coment out code not in useUbitUmarov2012-12-131-2/+2
| | |
| * | FIX small avatars movement on terrain. (avatar appearance getting evenUbitUmarov2012-12-131-4/+36
| | | | | | | | | | | | more messy)
| * | add some default size setting and checksUbitUmarov2012-12-071-1/+2
| | |
| * | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-2/+2
| | | | | | | | | | | | since at least for now seems good enought
| * | create a new ode character also with the new informationUbitUmarov2012-12-071-0/+6
| | |
| * | *TEST* Use new avatar size in ubitODE.UbitUmarov2012-12-071-0/+6
| | |
| * | avatar collision plane send to viewer is only relative to feet. changeUbitUmarov2012-12-051-4/+11
| | | | | | | | | | | | avatar collider, just rounding the boxes, etc
| * | *TEST* diferent avatar colliderUbitUmarov2012-12-031-2/+13
| | |
* | | Merge branch 'master' into careminsterMelanie2012-12-161-30/+6
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Simplify sit code a bit by determining correct animation in HandleSit ↵Dan Lake2012-12-131-30/+6
| | | | | | | | instead of HandleSitRequest. This eliminates m_nextSitAnimation, an unneeded state-saving variable in ScenePresence
* | Merge branch 'master' into careminsterMelanie2012-11-201-3/+20
|\ \ | |/
| * Minor formatting for 0962a35d and a few one-line comments as to why that ↵Justin Clark-Casey (justincc)2012-11-201-8/+7
| | | | | | | | code is there
| * Fix movetotarget on mega regions.Iain Oliver2012-11-201-3/+21
| |
* | Merge branch 'avination' into careminsterMelanie2012-11-171-0/+5
|\ \
| * | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵teravus2012-11-041-0/+5
| | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule.
* | | Merge branch 'master' into careminsterMelanie2012-11-031-3/+3
|\ \ \ | | |/ | |/|
| * | Change to earlier commit for TargetVelocity to support distributed physics.Dan Lake2012-11-021-3/+3
| | |
* | | Merge branch 'master' into careminsterMelanie2012-11-011-1/+1
|\ \ \ | |/ /
| * | Add TargetVelocity to PhysicsActor interface to support distributed physics. ↵Dan Lake2012-10-311-1/+1
| | | | | | | | | | | | No change to existing functions.
* | | Merge branch 'master' into careminsterMelanie2012-10-311-1/+4
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Store and send the current movement animation state to a new sim on crossingMelanie2012-10-301-0/+6
| | |