| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-13 | 2 | -9/+5 |
|\ |
|
| * | Trigger event with flag CHANGED_LINK when agent sits on objects that have not... | Marck | 2010-12-12 | 2 | -9/+6 |
| * | Fixes the nudge movements! | Diva Canto | 2010-12-11 | 3 | -47/+19 |
* | | Fix a perms issue when wearing an object from inworld | Melanie | 2010-12-12 | 1 | -10/+18 |
* | | Apply the useful part of diva's patch that was skipped | Melanie | 2010-12-12 | 2 | -31/+7 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -2/+21 |
|\ \
| |/ |
|
| * | Revert "Another stab at mantis #5256" | Diva Canto | 2010-12-10 | 1 | -12/+6 |
| * | Another stab at mantis #5256 | Diva Canto | 2010-12-10 | 1 | -6/+12 |
| * | fix the minimap sitting avatar location bug | Justin Clark-Casey (justincc) | 2010-12-10 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-09 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+11 |
| * | change doc. trivial commit to get panda to rebuild | Justin Clark-Casey (justincc) | 2010-12-08 | 1 | -1/+1 |
* | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+11 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Fixed some inconsistency with trailing /. Made debug messages consistent. Cha... | Diva Canto | 2010-12-05 | 2 | -4/+3 |
| * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 9 | -337/+278 |
| |\ |
|
| * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 6 | -26/+195 |
| |\ \ |
|
| * \ \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 9 | -85/+182 |
| |\ \ \ |
|
| * \ \ \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 2 | -3/+48 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 3 | -32/+52 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -11/+11 |
| |\ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -10/+16 |
| |\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 2 | -20/+53 |
| |\ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 5 | -139/+86 |
| |\ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-24 | 1 | -3/+16 |
| |\ \ \ \ \ \ \ \ \ \ |
|
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-04 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | |
|
| * | | | | | | | | | | | Various bug fixes for appearance handling: more aggressive reset of textures ... | Mic Bowman | 2010-12-03 | 1 | -16/+30 |
* | | | | | | | | | | | | When linking something, immediately persist the linked set. | Melanie | 2010-12-03 | 1 | -0/+1 |
* | | | | | | | | | | | | Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting ... | Melanie | 2010-12-03 | 1 | -9/+6 |
* | | | | | | | | | | | | Improve health reporting | Melanie | 2010-12-03 | 1 | -10/+18 |
* | | | | | | | | | | | | Fix health reporting. This will now actually monitor the threads properly | Melanie | 2010-12-03 | 1 | -3/+3 |
* | | | | | | | | | | | | Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to anoth... | Melanie | 2010-12-03 | 1 | -6/+9 |
* | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 6 | -131/+77 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / |
|
| * | | | | | | | | | | | Only force prim persistence before delete if the prim is the result of an unp... | Justin Clark-Casey (justincc) | 2010-12-03 | 3 | -8/+26 |
| * | | | | | | | | | | | Added some comments. Better than listening to the boring speaker... | Diva Canto | 2010-12-01 | 1 | -1/+4 |
| * | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-29 | 3 | -139/+177 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Preservation of creator information now also working in IARs. Cleaned up usag... | Diva Canto | 2010-11-29 | 1 | -31/+11 |
| * | | | | | | | | | | | | Changed the parser for InventoryItem deserialization. Moved some utility func... | Diva Canto | 2010-11-27 | 1 | -91/+31 |
| * | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-25 | 2 | -67/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ... | Diva Canto | 2010-11-25 | 2 | -0/+5 |
| | |_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Change the way sim health reporting reports sim startup | Melanie | 2010-12-03 | 1 | -6/+14 |
* | | | | | | | | | | | | | Various bug fixes for appearance handling | Mic Bowman | 2010-11-30 | 1 | -16/+30 |
* | | | | | | | | | | | | | Implement health monitoring of the packet receiving and sending threads | Melanie | 2010-11-28 | 1 | -3/+36 |
* | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-27 | 1 | -21/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|/ / / / / / / / / /
| |/| | | | | | | | | | | |
|
| * | | | | | | | | | | | | Reformat an overzealous comment. Remove end of line marks and reference to the | Melanie | 2010-11-27 | 1 | -21/+24 |
* | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-27 | 1 | -10/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / |
|
| * | | | | | | | | | | | | llUnsit position fix 4063 (updated 11-20-2010) | Micheil Merlin | 2010-11-27 | 1 | -2/+27 |
* | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-27 | 2 | -24/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / |
|
| * | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-11-27 | 1 | -15/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | If we fail to gather asset uuids for a particular asset, log the failing asse... | Justin Clark-Casey (justincc) | 2010-11-27 | 1 | -15/+25 |