aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* JustinCC's core re-mergeMelanie2013-01-161-3/+23
* Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-161-0/+4
|\
| * move resit fix to ScenePresence.cs and allow for requesting sit on objects ot...dahlia2013-01-141-0/+4
* | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-161-3/+3
|\ \ | |/
| * Fix exception reporting in SceneObjectPart so it logs what the exception is r...Robert Adams2013-01-111-2/+2
| * Save attachments on detach/exit if a contained script state has been changed.Justin Clark-Casey (justincc)2013-01-111-0/+3
* | Merge branch 'avination' into careminsterMelanie2013-01-133-31/+39
|\ \
| * | go back bypassing sog updates control (test)UbitUmarov2013-01-111-12/+12
| * | update the last information sent in terse updates where they are sent to allUbitUmarov2013-01-111-10/+19
| * | remove redundant lastPhysGroupPos and lastPhysGroupRot checksUbitUmarov2013-01-111-16/+3
| * | same for AngularVelocity. Use normal terse updates in place of sendingUbitUmarov2013-01-111-10/+18
| * | keyframe. Don't use group UpdateRotation since this enqueues a terseUbitUmarov2013-01-111-2/+6
* | | Merge branch 'master' into careminsterMelanie2013-01-111-103/+80
|\ \ \ | | |/ | |/|
| * | Move scene debug commands into separate module. Command changes from "debug ...Justin Clark-Casey (justincc)2013-01-101-94/+59
| * | refactor: route the final scene backup through the same code that handles per...Justin Clark-Casey (justincc)2013-01-101-10/+1
| * | Add "debug scene pbackup true|false" console command. This enables or disabl...Justin Clark-Casey (justincc)2013-01-101-9/+30
| * | 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
* | | 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