| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 1 | -2/+8 |
|\ |
|
| * | Global creator information working on MySQL DB and on load/save OARs. Creator... | Diva Canto | 2010-11-21 | 1 | -2/+8 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-18 | 1 | -53/+74 |
|\ \
| |/ |
|
| * | Fixed appearance send for avatars with only default textures. This should fix... | Master ScienceSim | 2010-11-18 | 1 | -53/+74 |
| * | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -22/+12 |
* | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -28/+12 |
* | | When detaching a scripted item, always consider it modified. Script states | Melanie | 2010-11-16 | 1 | -1/+7 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-09 | 2 | -33/+32 |
|\ \
| |/ |
|
| * | Formatting cleanup. | Jeff Ames | 2010-11-08 | 2 | -33/+32 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-08 | 1 | -4/+8 |
|\ \
| |/ |
|
| * | Detach attachments displaced by other attachments | Melanie | 2010-11-08 | 1 | -4/+8 |
* | | Fix the inventory transfer module to not cause duplicated text IMs | Melanie | 2010-11-05 | 1 | -3/+6 |
* | | Fix avatar to avatar inventory gives across servers | Melanie | 2010-11-04 | 1 | -8/+50 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 2 | -66/+33 |
|\ \
| |/ |
|
| * | Fix logins and avatar appearance. Contains a Migration. May contain nuts. | Melanie | 2010-10-30 | 1 | -5/+10 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -10/+5 |
| |\ |
|
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 1 | -29/+18 |
| | |\ |
|
| | * | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 1 | -10/+5 |
| * | | | minor: remove some old commented out code | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -22/+0 |
| | |/
| |/| |
|
| * | | Rationalize the logging messages from the merged appearance branch, commentin... | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -29/+18 |
| |/ |
|
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 2 | -84/+225 |
|\ \
| |/ |
|
| * | Bunch of fixes that reduce the number of times appearance | Master ScienceSim | 2010-10-29 | 2 | -43/+62 |
| * | Configuration of persistent baked textures and save/send delays. | Master ScienceSim | 2010-10-28 | 1 | -4/+14 |
| * | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 3 | -14/+83 |
| |\ |
|
| * | | Added background thread to handle delayed send and save of appearance | Master ScienceSim | 2010-10-28 | 1 | -55/+164 |
| * | | Made the check for texture assets asynchronous. This is one part of | Master ScienceSim | 2010-10-26 | 1 | -7/+10 |
| * | | Half of the compatibility is working. Login into a new region with | Master ScienceSim | 2010-10-25 | 1 | -1/+1 |
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 2 | -95/+158 |
|\ \ \ |
|
| * \ \ | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 2 | -95/+158 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... | Melanie | 2010-10-21 | 2 | -95/+158 |
| | |\ \
| | | |/ |
|
| | | * | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 2 | -95/+158 |
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-27 | 3 | -7/+7 |
|\ \ \ \
| |/ / / |
|
| * | | | Formatting cleanup. | Jeff Ames | 2010-10-27 | 3 | -7/+7 |
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 4 | -18/+86 |
|\ \ \ \
| |/ / / |
|
| * | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -3/+3 |
| * | | | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 1 | -3/+3 |
| |\ \ \ |
|
| | * \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 1 | -17/+65 |
| | |\ \ \
| | | | |/
| | | |/| |
|
| | * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 1 | -0/+329 |
| | |\ \ \ |
|
| | * \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-18 | 1 | -3/+3 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 3 | -0/+480 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-10 | 1 | -2/+10 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 2 | -7/+7 |
| | |\ \ \ \ \ \ \ |
|
| | * | | | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 1 | -3/+3 |
| * | | | | | | | | | print IAR version number on console when saving | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+6 |
| * | | | | | | | | | Implement guard against trying to load incompatible version IARs | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+19 |
| * | | | | | | | | | start parsing iar control file | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+19 |
| * | | | | | | | | | write IAR control file first in the archive rather than last | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -4/+6 |
| * | | | | | | | | | Allow region modules to know which agents actually receive chat | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -8/+36 |
| | |_|_|_|_|_|/ /
| |/| | | | | | | |
|
* | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 3 | -5/+384 |
|\ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/
| |/| | | | | | | |
|
| * | | | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 1 | -3/+3 |
| |/ / / / / / / |
|