| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 6 | -69/+37 |
|\ |
|
| * | Fixed some inconsistency with trailing /. Made debug messages consistent. Cha... | Diva Canto | 2010-12-05 | 1 | -14/+14 |
| * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 1 | -1/+8 |
| |\ |
|
| | * | Fix some crashes caused by the addition of the CreatorData column | Melanie | 2010-11-23 | 1 | -1/+8 |
| * | | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 4 | -0/+110 |
| |\ \
| | |/ |
|
| * | | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -3/+3 |
| |\ \ |
|
| * \ \ | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 1 | -0/+4 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 2 | -52/+53 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 2 | -1/+93 |
| |\ \ \ \ \ |
|
* | | | | | | | Add the ability for gods to impersonate users. For this, bit 6 needs to be | Melanie | 2010-11-25 | 2 | -0/+10 |
* | | | | | | | Fix some crashes caused by the addition of the CreatorData column | Melanie | 2010-11-22 | 1 | -1/+8 |
* | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 2 | -0/+5 |
|\ \ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | | |
|
| * | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-22 | 2 | -0/+5 |
| |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-21 | 1 | -0/+103 |
| | |\ \ \ \ \ \ |
|
| | * | | | | | | | Added creator info across the board -- TaskInventoryItems and InventoryItems ... | Diva Canto | 2010-11-21 | 2 | -0/+5 |
| * | | | | | | | | Fox the buglets in Freeswitch. Grid mode works now and there is no reason why... | Melanie | 2010-11-22 | 1 | -2/+3 |
| | |/ / / / / /
| |/| | | | | | |
|
| * | | | | | | | Add the remote connector for freeswitch config retrieval | Melanie | 2010-11-21 | 1 | -0/+103 |
| |/ / / / / / |
|
| * | | | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -0/+1 |
| | |_|_|_|/
| |/| | | | |
|
* | | | | | | Fox the buglets in Freeswitch. Grid mode works now and there is no reason why... | Melanie | 2010-11-22 | 1 | -2/+3 |
* | | | | | | Add the remote connector for freeswitch config retrieval | Melanie | 2010-11-21 | 1 | -0/+103 |
* | | | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -0/+1 |
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-09 | 1 | -3/+3 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Formatting cleanup. | Jeff Ames | 2010-11-08 | 1 | -3/+3 |
| | |_|_|/
| |/| | | |
|
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-03 | 1 | -0/+4 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Add lsClearWindlightScene() to the lightshare module to remove WL settings | Melanie | 2010-11-03 | 1 | -0/+4 |
| | |_|/
| |/| | |
|
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 2 | -54/+55 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 1 | -28/+28 |
| |\ \ \ |
|
| | * | | | Change level of some logging messages, turning some info into arguably more a... | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -28/+28 |
| * | | | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 1 | -26/+27 |
| |/ / / |
|
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 2 | -1/+93 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 2 | -1/+93 |
| |\ \ \ |
|
| | * \ \ | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... | Melanie | 2010-10-21 | 2 | -1/+93 |
| | |\ \ \
| | | | |/
| | | |/| |
|
| | | * | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 2 | -1/+93 |
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 5 | -29/+70 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 6 | -42/+74 |
| | |_|/
| |/| | |
|
| * | | | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 2 | -14/+23 |
| * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 1 | -1/+1 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -15/+15 |
| * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 2 | -5/+9 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 1 | -1/+1 |
| |\ \ \ \ |
|
| * | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 2 | -17/+7 |
| * | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 5 | -58/+27 |
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 6 | -76/+31 |
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -15/+15 |
| * | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 2 | -17/+7 |
| * | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 5 | -58/+27 |
| | |_|_|/
| |/| | | |
|
| * | | | | Deleted verbose debug messages that are bringing sims to an halt. Increased t... | Diva Canto | 2010-10-19 | 1 | -1/+1 |
| | |_|/
| |/| | |
|
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 1 | -2/+6 |
|\ \ \ \
| |/ / / |
|
| * | | | Added viewer's channel, mac, and id0 to agent circuit data. Also moved client... | Diva Canto | 2010-10-03 | 1 | -2/+6 |
| * | | | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 1 | -3/+3 |
| | |/
| |/| |
|