aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-01-103-59/+72
|\
| * Change IsRoot to use ReferenceEquals to prevent operator == messinessMelanie2013-01-091-1/+1
| * Revert "Prevent empty Anim Packs"Melanie2013-01-091-12/+0
| * Revert "Fix sequence id fr default anim"Melanie2013-01-091-1/+1
| * Fix sequence id fr default animMelanie2013-01-081-1/+1
| * Prevent empty Anim PacksMelanie2013-01-081-0/+12
| * 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
| | * Revert "Remove sending AvatarData because this also happens on login, where i...Melanie2013-01-081-1/+9
| | * 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
| * | | Prevent avatar data from being sent during login when it's not valid andMelanie2013-01-082-2/+6
| | |/ | |/|
| * | 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
| |/
| * 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
| * 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
| |\
| | * Merge branch 'avination' into ubitworkUbitUmarov2012-12-181-3/+3
| | |\
| | * \ Merge branch 'avination' into ubitworkUbitUmarov2012-12-181-4/+6
| | |\ \
| | * | | some clean up/fixUbitUmarov2012-12-171-47/+46
| * | | | * Partial Commit for Avatar Appearance to include the functionality of Cached...teravus2012-12-211-10/+17
| * | | | * Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to synchr...teravus2012-12-191-0/+20
| | |_|/ | |/| |
* | | | Merge branch 'master' into careminsterMelanie2013-01-044-81/+74
|\ \ \ \
| * | | | Fix llGetLinkKey() to return the last sat avatar as the last link number.Justin Clark-Casey (justincc)2013-01-042-46/+68
| * | | | Fixed several problems with the Sun: some settings didn't work, or were incon...Oren Hurvitz2013-01-022-35/+6
* | | | | Merge branch 'master' into careminsterMelanie2012-12-301-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | ScenePresence passes the avatar rotation down to the physics engine. This wil...Robert Adams2012-12-281-0/+4
* | | | | Merge branch 'master' into careminsterMelanie2012-12-281-3/+8
|\ \ \ \ \ | |/ / / /
| * | | | Add check to always push terse updates for presences that have new velocities...Robert Adams2012-12-271-3/+8
* | | | | Merge branch 'master' into careminsterMelanie2012-12-212-6/+15
|\ \ \ \ \ | |/ / / /
| * | | | Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. Als...Robert Adams2012-12-182-6/+15
* | | | | Merge branch 'avination' into careminsterMelanie2012-12-182-184/+123
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix locking for goodMelanie2012-12-181-3/+3
| | |_|/ | |/| |
| * | | Merge branch 'ubitwork' into avinationMelanie2012-12-171-174/+48
| |\ \ \ | | | |/ | | |/|
| | * | * TEST * unscripted sitUbitUmarov2012-12-171-174/+48
| * | | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avina...Melanie2012-12-171-3/+3
| |\ \ \
| | * | | * Fix for Prim Locking. Prior to the merge, it was just a clone of the root...teravus2012-12-151-4/+4
| | |/ /
| * | | Fix locking objectsMelanie2012-12-161-1/+3
| |/ /
| * | 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
| * | 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