aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-142-4/+93
|\
| * fix mistake in last change of local.includeJustin Clark-Casey (justincc)2010-12-151-4/+6
| * Rename SceneObjectUserTests to SceneObjectDeRezTests to better reflect its co...Justin Clark-Casey (justincc)2010-12-141-0/+0
| * minor: disable debug logging for previous testJustin Clark-Casey (justincc)2010-12-141-1/+1
| * Start implementing a test for 'share with group' object functionality. Not y...Justin Clark-Casey (justincc)2010-12-141-0/+87
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-141-2/+4
|\ \ | |/
| * Null checking ParentGroup is not needed. It can't be null.Melanie2010-12-141-4/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-12-132-12/+10
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-12-141-5/+8
| | |\
| | | * Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-131-14/+0
| | | * Change some lookups in he Land Management module to make group permissionsMelanie2010-12-131-1/+18
| | * | reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being u...Justin Clark-Casey (justincc)2010-12-141-7/+2
| | |/
| * | This seems to get rid of the stuck PREJUMP animation, as reported by Justin i...Diva Canto2010-12-132-3/+13
| |/
* | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-12-131-5/+8
|\ \
| * | Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-131-14/+0
| * | Change some lookups in he Land Management module to make group permissionsMelanie2010-12-131-1/+18
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-132-9/+5
|\ \ \ | |/ / |/| / | |/
| * Trigger event with flag CHANGED_LINK when agent sits on objects that have not...Marck2010-12-122-9/+6
| * Fixes the nudge movements!Diva Canto2010-12-113-47/+19
* | Fix a perms issue when wearing an object from inworldMelanie2010-12-121-10/+18
* | Apply the useful part of diva's patch that was skippedMelanie2010-12-122-31/+7
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-121-2/+21
|\ \ | |/
| * Revert "Another stab at mantis #5256"Diva Canto2010-12-101-12/+6
| * Another stab at mantis #5256Diva Canto2010-12-101-6/+12
| * fix the minimap sitting avatar location bugJustin Clark-Casey (justincc)2010-12-101-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-091-1/+1
|\ \ | |/
| * Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+11
| * change doc. trivial commit to get panda to rebuildJustin Clark-Casey (justincc)2010-12-081-1/+1
* | Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+11
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-0/+1
|\ \ | |/
| * Fixed some inconsistency with trailing /. Made debug messages consistent. Cha...Diva Canto2010-12-052-4/+3
| * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-059-337/+278
| |\
| * \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-236-26/+195
| |\ \
| * \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-219-85/+182
| |\ \ \
| * \ \ \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-212-3/+48
| |\ \ \ \
| * \ \ \ \ Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-053-32/+52
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-11/+11
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-10/+16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-292-20/+53
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-295-139/+86
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-241-3/+16
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-041-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Various bug fixes for appearance handling: more aggressive reset of textures ...Mic Bowman2010-12-031-16/+30
* | | | | | | | | | | | When linking something, immediately persist the linked set.Melanie2010-12-031-0/+1
* | | | | | | | | | | | Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting ...Melanie2010-12-031-9/+6
* | | | | | | | | | | | Improve health reportingMelanie2010-12-031-10/+18
* | | | | | | | | | | | Fix health reporting. This will now actually monitor the threads properlyMelanie2010-12-031-3/+3
* | | | | | | | | | | | Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to anoth...Melanie2010-12-031-6/+9
* | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-036-131/+77
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Only force prim persistence before delete if the prim is the result of an unp...Justin Clark-Casey (justincc)2010-12-033-8/+26