Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prevent a null ref when an avatar login doesn't go as planned | Melanie | 2010-12-22 | 1 | -1/+1 |
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -0/+2 |
|\ | |||||
| * | * Adds AbortXfer to the ClientAPI mix | Teravus Ovares (Dan Olivares) | 2010-12-21 | 1 | -0/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 2 | -9/+7 |
|\ \ | |/ | |||||
| * | Shooting in the dark for solutions to the appearance problem | Mic Bowman | 2010-12-20 | 2 | -8/+8 |
| * | Fix notecards that end with an embedded object causing an exception | Melanie | 2010-12-17 | 1 | -2/+2 |
| * | Revamp the viewer -> banlist packet processing so fix a number of bugs. | Melanie | 2010-12-13 | 1 | -3/+4 |
* | | Fix notecards that end with an embedded object causing an exception | Melanie | 2010-12-16 | 1 | -2/+2 |
* | | Revamp the viewer -> banlist packet processing so fix a number of bugs. | Melanie | 2010-12-13 | 1 | -3/+4 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | minor: remove some compiler warnings | Justin Clark-Casey (justincc) | 2010-12-10 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-09 | 1 | -0/+81 |
|\ \ | |/ | |||||
| * | Added ability for GetTexture to serve multiple formats. The format may come a... | Diva Canto | 2010-12-08 | 1 | -0/+81 |
* | | Update calling card interface | Melanie | 2010-12-07 | 1 | -1/+1 |
* | | Add the interface needed to revive calling cards | Melanie | 2010-12-07 | 1 | -0/+13 |
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Melanie | 2010-12-07 | 4 | -8/+39 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 3 | -7/+38 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 11 | -178/+438 |
| | |\ | |||||
| | * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 2 | -1/+2 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 5 | -3/+123 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 4 | -48/+47 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 6 | -4/+46 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 2 | -16/+58 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -4/+0 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 5 | -319/+151 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 2 | -23/+16 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -19/+116 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 8 | -546/+695 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | sacha | 2010-12-04 | 2 | -6/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | add more detail to the log in case of FORM Timeout | sacha | 2010-12-04 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Lock the attachments dict so it doesn't get out of sync when iterating | Melanie | 2010-12-06 | 1 | -35/+59 |
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-04 | 2 | -6/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Various bug fixes for appearance handling: more aggressive reset of textures ... | Mic Bowman | 2010-12-03 | 2 | -10/+30 |
* | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 5 | -137/+380 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Added some comments. Better than listening to the boring speaker... | Diva Canto | 2010-12-01 | 1 | -0/+12 |
| * | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-29 | 3 | -30/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fix unit test. | Diva Canto | 2010-11-29 | 1 | -0/+6 |
| * | | | | | | | | | | | | | Preservation of creator information now also working in IARs. Cleaned up usag... | Diva Canto | 2010-11-29 | 5 | -113/+139 |
| * | | | | | | | | | | | | | Changed the parser for InventoryItem deserialization. Moved some utility func... | Diva Canto | 2010-11-27 | 2 | -30/+229 |
* | | | | | | | | | | | | | | Various bug fixes for appearance handling | Mic Bowman | 2010-11-30 | 2 | -5/+22 |
* | | | | | | | | | | | | | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Melanie | 2010-11-27 | 1 | -2/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-27 | 1 | -2/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Refactor appearance and avatar data sending code. Paritioning the routines in... | Mic Bowman | 2010-11-27 | 2 | -28/+17 |
| | * | | | | | | | | | | | | | Fix handling of landmarks for systems with culture settings other than en_US.... | Marck | 2010-11-26 | 1 | -2/+10 |
| | |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Instrument TI Dictionary to finally find that pesky script-caused deadlock | Melanie | 2010-11-27 | 1 | -3/+33 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Change all restarting to use the restart module. Remove hardcoded behavior | Melanie | 2010-11-25 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Prevent an overlength button label from producing a debug dump and aborting | Melanie | 2010-11-24 | 2 | -28/+17 |
* | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ |