aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix notecards that end with an embedded object causing an exceptionMelanie2010-12-161-2/+2
* Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-131-3/+4
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-121-1/+1
|\
| * minor: remove some compiler warningsJustin Clark-Casey (justincc)2010-12-101-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-091-0/+81
|\ \ | |/
| * Added ability for GetTexture to serve multiple formats. The format may come a...Diva Canto2010-12-081-0/+81
* | Update calling card interfaceMelanie2010-12-071-1/+1
* | Add the interface needed to revive calling cardsMelanie2010-12-071-0/+13
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2010-12-074-8/+39
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-063-7/+38
| |\ \ | | |/
| | * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-0511-178/+438
| | |\
| | * \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-232-1/+2
| | |\ \
| | * \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-215-3/+123
| | |\ \ \
| | * \ \ \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-214-48/+47
| | |\ \ \ \
| | * \ \ \ \ Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-056-4/+46
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-302-16/+58
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-4/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-305-319/+151
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-292-23/+16
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-19/+116
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-298-546/+695
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...sacha2010-12-042-6/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | add more detail to the log in case of FORM Timeoutsacha2010-12-041-1/+1
* | | | | | | | | | | | | | | Lock the attachments dict so it doesn't get out of sync when iteratingMelanie2010-12-061-35/+59
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-042-6/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Various bug fixes for appearance handling: more aggressive reset of textures ...Mic Bowman2010-12-032-10/+30
* | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-035-137/+380
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Added some comments. Better than listening to the boring speaker...Diva Canto2010-12-011-0/+12
| * | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-293-30/+27
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix unit test.Diva Canto2010-11-291-0/+6
| * | | | | | | | | | | | | Preservation of creator information now also working in IARs. Cleaned up usag...Diva Canto2010-11-295-113/+139
| * | | | | | | | | | | | | Changed the parser for InventoryItem deserialization. Moved some utility func...Diva Canto2010-11-272-30/+229
* | | | | | | | | | | | | | Various bug fixes for appearance handlingMic Bowman2010-11-302-5/+22
* | | | | | | | | | | | | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2010-11-271-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-11-271-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Refactor appearance and avatar data sending code. Paritioning the routines in...Mic Bowman2010-11-272-28/+17
| | * | | | | | | | | | | | | Fix handling of landmarks for systems with culture settings other than en_US....Marck2010-11-261-2/+10
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | Instrument TI Dictionary to finally find that pesky script-caused deadlockMelanie2010-11-271-3/+33
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Change all restarting to use the restart module. Remove hardcoded behaviorMelanie2010-11-251-1/+1
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Prevent an overlength button label from producing a debug dump and abortingMelanie2010-11-242-28/+17
* | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-11-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Initialize InventoryItemBase.creatorData properly. Could throw.Diva Canto2010-11-231-1/+1
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Fix some crashes caused by the addition of the CreatorData columnMelanie2010-11-231-0/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Fix some crashes caused by the addition of the CreatorData columnMelanie2010-11-222-0/+2
* | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-222-0/+106
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Added creator info across the board -- TaskInventoryItems and InventoryItems ...Diva Canto2010-11-212-0/+106
* | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-182-3/+16
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | small refactor: reuse existing commandLine string rather than calling cmdline...Justin Clark-Casey (justincc)2010-11-171-1/+1