aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitwork' into avinationMelanie2012-07-174-51/+70
|\
| * minor changes, removed extra parts physics updates on linking nonrootUbitUmarov2012-07-171-2/+3
| * fix our stats ( old schema )UbitUmarov2012-07-172-48/+66
| * Merge branch 'avination' into ubitworkUbitUmarov2012-07-173-10/+4
| |\
| * \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-172-16/+0
| |\ \
| * \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-07-1754-1302/+3004
| |\ \ \
| * | | | remove forgotten line...UbitUmarov2012-07-141-1/+0
| * | | | don't subscribe collision events for nonphysical parts only because ofUbitUmarov2012-07-142-1/+2
* | | | | Replace PollServiceRequestManager with older version, add extra logging toMelanie2012-07-171-0/+1
| |_|_|/ |/| | |
* | | | Fix merge artefactsMelanie2012-07-173-10/+4
| |_|/ |/| |
* | | Merge branch 'master' into careminsterMelanie2012-07-162-16/+0
|\ \ \ | |_|/ |/| |
| * | Revert "Fix script "Running" behavior"Melanie2012-07-162-16/+0
* | | Merge branch 'avination' into careminsterMelanie2012-07-163-4/+14
|\ \ \ | | |/ | |/|
| * | missed fix on vehicle reference frameUbitUmarov2012-07-131-2/+1
| * | Revert "Add instrumentation to log finalizer being called. Suppressed for bac...Melanie2012-07-122-12/+6
| * | Revert "Place instrumentation in the proper place. This needs reverting, too!"Melanie2012-07-121-1/+1
| * | Add "gc collect" console command for debugging memleaksMelanie2012-07-121-0/+7
| * | Place instrumentation in the proper place. This needs reverting, too!Melanie2012-07-111-1/+1
| * | Add instrumentation to log finalizer being called. Suppressed for backupMelanie2012-07-112-6/+12
| * | Change order of operations on backup to ensure keyframe motions are backedMelanie2012-07-111-2/+6
* | | Merge branch 'master' into careminsterMelanie2012-07-132-7/+19
|\ \ \ | | |/ | |/|
| * | Don't cache regions data on the other unused LocalGridServiceConnector that t...Justin Clark-Casey (justincc)2012-07-131-5/+17
| * | Change very recent AllowedViewerList and BannedViewerList config setting name...Justin Clark-Casey (justincc)2012-07-121-4/+4
* | | Merge branch 'master' into careminsterMelanie2012-07-124-26/+98
|\ \ \ | |/ /
| * | Many explanitory comments added to the link and delink code inRobert Adams2012-07-112-23/+93
| * | Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-112-1/+5
* | | Merge branch 'avination' into careminsterMelanie2012-07-114-33/+119
|\ \ \ | | |/ | |/|
| * | Melanie fix: detach SOGs from backup on linkingUbitUmarov2012-07-111-0/+2
| * | let SOP AngularVelocity set physics actor angular velocity if it'sUbitUmarov2012-07-101-1/+9
| * | more work on llSetAngularVelocity()UbitUmarov2012-07-101-1/+28
| * | Change semantics of FromXML on vehicle data to make the serializer a bit cleanerMelanie2012-07-072-7/+19
| * | fix vehicle to XML stringUbitUmarov2012-07-071-7/+13
| * | Add saving vehicle physics data to the databaseMelanie2012-07-073-25/+56
* | | Merge branch 'master' into careminsterMelanie2012-07-1110-96/+346
|\ \ \ | | |/ | |/|
| * | If a part has a sit target and an avatar is already sitting, allow another av...Justin Clark-Casey (justincc)2012-07-101-7/+4
| * | refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() ...Justin Clark-Casey (justincc)2012-07-102-5/+6
| * | Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"Justin Clark-Casey (justincc)2012-07-102-8/+3
| * | refactor: Add SOP.IsSitTargetOccupied to improve readabilityJustin Clark-Casey (justincc)2012-07-102-3/+8
| * | refactor: use sit orientation argument passed in to SP.SendSitResponse() rath...Justin Clark-Casey (justincc)2012-07-101-4/+2
| * | Move common code to detect whether a part has a valid sit target into a SOP p...Justin Clark-Casey (justincc)2012-07-102-30/+20
| * | Remove log line accidentally left in SP.SendSitResponse()Justin Clark-Casey (justincc)2012-07-101-1/+1
| * | Fix recent SOP.GetSittingAvatars() to return null if there are no sitting ava...Justin Clark-Casey (justincc)2012-07-102-6/+32
| * | When an attachment is detached to inv or derezzed, stop the scripts, update t...Justin Clark-Casey (justincc)2012-07-104-7/+96
| * | Don't allow a prim to be sat upon if its part of an attachmentJustin Clark-Casey (justincc)2012-07-091-0/+9
| * | Do not allow a script to attach a prim if its being sat upon.Justin Clark-Casey (justincc)2012-07-093-8/+122
| * | Remove redundant SetScene() function in Scene.AddSceneObject()Justin Clark-Casey (justincc)2012-07-073-15/+3
| * | Remove now duplicate interregion object check that should have been removed a...Justin Clark-Casey (justincc)2012-07-061-12/+0
| * | Add assert to attachment regression tests to check that number of objects in ...Justin Clark-Casey (justincc)2012-07-062-5/+24
| * | Mantis 6063 osNpcTouch.Talun2012-07-061-0/+8
| * | Pull prim crossing/teleport checks up into Scene.IncomingCreateObject() from ...Justin Clark-Casey (justincc)2012-07-061-14/+27