aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-01-232-10/+30
|\
| * Add accessors to allow serializing rot and position targetsMelanie2013-01-211-2/+12
| * Limit active at targets to 8Melanie2013-01-211-2/+6
| * Prevent scene from holding references to SOGs with attargets beyond SOG deletionMelanie2013-01-211-6/+12
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-01-232-1/+3
|\ \
| * \ Merge branch 'avination'Melanie2013-01-192-1/+3
| |\ \ | | |/
| | * dont send a full grp update on stopmovetotarget. just a rootpart terseUbitUmarov2013-01-162-1/+3
* | | Merge branch 'master' into careminsterMelanie2013-01-232-14/+1
|\ \ \ | |/ / |/| |
| * | Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenterRobert Adams2013-01-211-0/+10
| * | Check the existing ScenePresence.ParentPart to make sure we're not trying to ...Justin Clark-Casey (justincc)2013-01-191-2/+1
* | | Merge branch 'master' into careminsterMelanie2013-01-194-11/+59
|\ \ \ | |/ /
| * | Add "debug set set animations true|false" region console command.Justin Clark-Casey (justincc)2013-01-182-5/+33
| * | Restore previous client AO behaviour by not allowing them to remove the defau...Justin Clark-Casey (justincc)2013-01-183-6/+25
| * | Implement co-operative script termination if termination comes during a scrip...Justin Clark-Casey (justincc)2013-01-161-3/+23
| * | Revert "Implement co-operative script termination if termination comes during...Justin Clark-Casey (justincc)2013-01-161-23/+3
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-161-0/+4
| |\ \
| * | | Implement co-operative script termination if termination comes during a scrip...Justin Clark-Casey (justincc)2013-01-161-3/+23
* | | | 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
| | |/ / | |/| |