Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Initialize InventoryItemBase.creatorData properly. Could throw. | Diva Canto | 2010-11-23 | 1 | -1/+1 | |
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix some crashes caused by the addition of the CreatorData column | Melanie | 2010-11-23 | 1 | -0/+1 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Fix some crashes caused by the addition of the CreatorData column | Melanie | 2010-11-22 | 2 | -0/+2 | |
* | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 2 | -0/+106 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Added creator info across the board -- TaskInventoryItems and InventoryItems ... | Diva Canto | 2010-11-21 | 2 | -0/+106 | |
* | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-18 | 2 | -3/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | small refactor: reuse existing commandLine string rather than calling cmdline... | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -1/+1 | |
| * | | | | | | | | | | save all lines to history, not just those which turn out to be valid comands.... | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -2/+7 | |
| * | | | | | | | | | | minor: add some method comments | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -0/+8 | |
| * | | | | | | | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -0/+1 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
* | | | | | | | | | | 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 | 4 | -48/+47 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Formatting cleanup. | Jeff Ames | 2010-11-08 | 4 | -48/+47 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Remove "OpenSimulator" from startup message | Melanie | 2010-11-09 | 1 | -1/+1 | |
* | | | | | | | | | Change "OpenSim" to "Careminster" and remove CM suffix. | Melanie | 2010-11-09 | 1 | -2/+2 | |
* | | | | | | | | | Revert "Fix for hanging on "Connecting to region".. caused by packets being p... | Melanie | 2010-11-05 | 1 | -1/+0 | |
* | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-03 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | When LightShare is enabled, the standard day cycle is bypassed and replaced by | Melanie | 2010-11-03 | 1 | -0/+1 | |
| * | | | | | | | | Admin Server can now bind to a private ip address | mores | 2010-11-03 | 1 | -0/+9 |