aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * save all lines to history, not just those which turn out to be valid comands....Justin Clark-Casey (justincc)2010-11-171-2/+7
| * minor: add some method commentsJustin Clark-Casey (justincc)2010-11-171-0/+8
| * Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-0/+1
* | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-0/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-094-48/+47
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-11-084-48/+47
* | Remove "OpenSimulator" from startup messageMelanie2010-11-091-1/+1
* | Change "OpenSim" to "Careminster" and remove CM suffix.Melanie2010-11-091-2/+2
* | Revert "Fix for hanging on "Connecting to region".. caused by packets being p...Melanie2010-11-051-1/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-031-0/+1
|\ \ | |/
| * When LightShare is enabled, the standard day cycle is bypassed and replaced byMelanie2010-11-031-0/+1
| * Admin Server can now bind to a private ip addressmores2010-11-031-0/+9
* | Admin Server can now bind to a private ip addressmores2010-11-031-0/+9
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-028-349/+244
|\ \ | |/
| * Fix default club feetMelanie2010-11-021-1/+1
| * Add support for cross-domain AJAX requests to REST console.Marck2010-11-021-0/+31
| * Support for CORS with simple requests in BaseHttpServerMarck2010-11-021-0/+4
| * Try to not make avatars switch outfitsMelanie2010-11-021-3/+0
| * Fix logins and avatar appearance. Contains a Migration. May contain nuts.Melanie2010-10-302-16/+58
| * On first login, Ruth is back now. Strangely, inventory items are created forMelanie2010-10-301-4/+0
| * Logins work now, but avatars are green ugly gnomes.Melanie2010-10-301-2/+0
| * This commit fixes all the appearance related null refs. Still can't log in,Melanie2010-10-302-3/+8
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-302-23/+16
| |\
| | * Rationalize the logging messages from the merged appearance branch, commentin...Justin Clark-Casey (justincc)2010-10-292-23/+16