aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* replace old Attachoffset by AttachedPos. Comented out possible mergeUbitUmarov2014-07-203-11/+9
* Merge branch 'avination-current'Melanie Thielker2014-07-191-15/+64
|\
| * Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in...UbitUmarov2014-07-162-17/+19
| |\
| * \ Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in...UbitUmarov2013-09-197-17/+26
| |\ \
| * | | keyframe: add more locks, change timming stop, added Suspend and resumeUbitUmarov2013-06-061-15/+64
* | | | fix attachmentsUbitUmarov2014-07-191-7/+9
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2144-1033/+2889
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into careminsterMelanie2014-01-289-280/+367
| |\ \ \
| | * | | Reinsert attachments list taking code in SP.MakeRootAgent()Justin Clark-Casey (justincc)2014-01-271-14/+30
| | * | | refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which occu...Justin Clark-Casey (justincc)2014-01-271-2/+1
| | * | | Add back code to UuidGatherer to retrieve UUIDs for materials stored in DynAt...dahlia2014-01-201-0/+73
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2014-01-201-0/+7
| | |\ \ \
| | | * | | Clean up orphaned json stores. This can happen when an object isMic Bowman2014-01-201-0/+7
| | * | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-202-15/+154
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Stop exceptions being generated on agent connection if a telehub object has b...Justin Clark-Casey (justincc)2014-01-202-15/+154
| | * | | | Materials module: a) Store materials as assets; b) Finalized it (removed the ...Oren Hurvitz2014-01-202-97/+53
| | * | | | minor: reinsert some method doc back into IEntityTransferModuleJustin Clark-Casey (justincc)2014-01-171-0/+20
| | * | | | Reorder checks in SP.CompleteMovement() to fix test failuresJustin Clark-Casey (justincc)2014-01-161-36/+33
| | * | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-162-57/+68
| | |\ \ \ \ | | | |/ / /
| | | * | | Actually put IsChildAgent = true inside the lock, otherwise there is still a ...Justin Clark-Casey (justincc)2014-01-161-1/+3
| | | * | | Prevent duplicate invocations or race dontision in SP.CompleteMovement()Justin Clark-Casey (justincc)2014-01-162-56/+65
| | * | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-162-123/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Remove old IInterRegionComms and references. This hasn't been used since 200...Justin Clark-Casey (justincc)2014-01-162-123/+0
| * | | | | Merge branch 'master' into careminsterMelanie2014-01-285-50/+95
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-101-5/+5
| | |\ \ \ \ | | | |/ / /
| | | * | | When moving the root prim of an attachment: a) Change the attach position; b)...Oren Hurvitz2014-01-101-5/+5
| | * | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-104-71/+92
| | |\ \ \ \ | | | |/ / /
| | | * | | Refactored: use a single function to apply an object's folded permissions to ...Oren Hurvitz2014-01-102-14/+14
| | | * | | Refactored setting permissions when rezzing items: use the same function when...Oren Hurvitz2014-01-103-57/+78
| | * | | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-081-0/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | If an agent is sitting, then do send the rotation in the agent update instead...Justin Clark-Casey (justincc)2014-01-081-0/+2
| * | | | | Intermediate commit. Sill errors.Melanie2014-01-058-36/+79
| |\ \ \ \ \ | | |/ / / /
| | * | | | Some missing definitions needed for successful compilation.Robert Adams2014-01-041-1/+2
| | * | | | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-042-4/+10
| | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-12-163-15/+39
| | |\ \ \ \
| | | * \ \ \ Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-3/+12
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Wrap analysis of the particle system in the UUID Gatherer in a separate try/c...Justin Clark-Casey (justincc)2013-12-141-3/+12
| | | * | | | Comment out sit position checks in TestSitAndStandWithSitTarget() in SP and N...Justin Clark-Casey (justincc)2013-12-141-8/+6
| | | * | | | Fix build break in test from previous commit 54cc229 - hadn't realized SceneP...Justin Clark-Casey (justincc)2013-12-141-1/+1
| | | * | | | Fix TestSitAndStandWithNoSitTarget NPC and SP tests.Justin Clark-Casey (justincc)2013-12-141-1/+1
| | | * | | | Eliminate unnecessary line from my previous commit 1d605642Justin Clark-Casey (justincc)2013-12-131-2/+0
| | | * | | | Refix sitting on child prims by reinserting relevant code back into SP.Handle...Justin Clark-Casey (justincc)2013-12-111-3/+22
| | * | | | | This is the acutal sitting avatar crossing code. This commit implements theMelanie2013-12-161-2/+152
| | |/ / / /
| | * | | | Replace proprietary file header with BSD oneMelanie2013-12-111-6/+27
| | * | | | Add missing files *blush*Melanie2013-12-111-0/+19
| | * | | | Committing the Avination Scene Presence and related texture codeMelanie2013-12-113-354/+713
| | * | | | This is the Avination Entity Transfer Module. Surprisingly, it still compilesMelanie2013-12-111-22/+10
| | |/ / /
| * | | | Merge branch 'master' into careminsterMelanie2013-12-072-99/+183
| |\ \ \ \ | | |/ / /
| | * | | Fix regression where mouse look flight direction no longer worked by zeroing ...Justin Clark-Casey (justincc)2013-12-051-13/+2
| | * | | Ignore X and Y body rotations when sent by mouse look.Justin Clark-Casey (justincc)2013-12-031-3/+15