aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-0511-337/+318
| |\
| * \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-236-26/+195
| |\ \
| * \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-2112-91/+211
| |\ \ \
| * \ \ \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-212-3/+48
| |\ \ \ \
| * \ \ \ \ Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-055-32/+54
| |\ \ \ \ \
| * \ \ \ \ \ 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-293-20/+92
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-296-177/+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-037-131/+78
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Only force prim persistence before delete if the prim is the result of an unp...Justin Clark-Casey (justincc)2010-12-033-8/+26
| * | | | | | | | | | | Added some comments. Better than listening to the boring speaker...Diva Canto2010-12-011-1/+4
| * | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-293-139/+177
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Preservation of creator information now also working in IARs. Cleaned up usag...Diva Canto2010-11-291-31/+11
| * | | | | | | | | | | | Changed the parser for InventoryItem deserialization. Moved some utility func...Diva Canto2010-11-271-91/+31
| * | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-253-67/+49
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ...Diva Canto2010-11-253-0/+6
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Change the way sim health reporting reports sim startupMelanie2010-12-031-6/+14
* | | | | | | | | | | | | Various bug fixes for appearance handlingMic Bowman2010-11-301-16/+30
* | | | | | | | | | | | | Implement health monitoring of the packet receiving and sending threadsMelanie2010-11-281-3/+36
* | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-271-21/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Reformat an overzealous comment. Remove end of line marks and reference to theMelanie2010-11-271-21/+24
* | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-271-10/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | llUnsit position fix 4063 (updated 11-20-2010)Micheil Merlin2010-11-271-2/+27
* | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-272-24/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-11-271-15/+25
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | If we fail to gather asset uuids for a particular asset, log the failing asse...Justin Clark-Casey (justincc)2010-11-271-15/+25
| * | | | | | | | | | | | | Refactor appearance and avatar data sending code. Paritioning the routines in...Mic Bowman2010-11-271-114/+117
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Trigger changed event with CHANGED_TELEPORT when teleporting to another region.Marck2010-11-261-9/+6
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-252-79/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Change all restarting to use the restart module. Remove hardcoded behaviorMelanie2010-11-252-67/+10
* | | | | | | | | | | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-11-253-117/+120
|\ \ \ \ \ \ \ \ \ \ \ \