aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-305-316/+145
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-294-157/+207
|\ \ | |/
| * Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-294-157/+207
| |\
| | * Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-291-18/+17
| | * Configuration of persistent baked textures and save/send delays.Master ScienceSim2010-10-281-1/+13
| | * Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-281-0/+2
| | |\
| | * | Added background thread to handle delayed send and save of appearanceMaster ScienceSim2010-10-281-4/+7
| | * | Small cleanup and add more debugging informationMaster ScienceSim2010-10-262-8/+23
| | * | Half of the compatibility is working. Login into a new region withMaster ScienceSim2010-10-253-20/+28
| | * | Intermediate commit for backward compatability; does not compile yetMic Bowman2010-10-252-62/+73
| | * | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-211-68/+70
| * | | Add my work on top of cmickeyb'sMelanie2010-10-291-1/+99
* | | | Add my work on top of cmickeyb'sMelanie2010-10-291-1/+99
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-298-504/+602
|\ \ \ \ | |/ / /
| * | | Merge branch 'dev-appearance'Melanie2010-10-298-504/+602
| |\ \ \
| | * \ \ Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a...Melanie2010-10-218-504/+602
| | |\ \ \ | | | |/ /
| | | * | Major refactoring of appearance handling.Master ScienceSim2010-10-208-504/+602
| * | | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-291-193/+258
| * | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-291-258/+193
| | |_|/ | |/| |
* | | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-291-193/+258
* | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-291-258/+193
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-234-38/+9
|\ \ \ \ | |/ / /
| * | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-223-38/+7
| * | | Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-223-7/+38
| |\ \ \
| | * | | * remove some spurious debug infoJonathan Freedman2010-10-201-5/+5
| | * | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-174-6/+146
| | |\ \ \ | | | | |/ | | | |/|
| | * | | * more url / hg cleanupJonathan Freedman2010-10-112-4/+29
| | * | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-102-17/+21
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-051-1/+36
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-031-0/+11
| | |\ \ \ \ \
| | * | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-022-6/+12
| * | | | | | | Allow OARs and IARs to save and load meshes.Justin Clark-Casey (justincc)2010-10-221-0/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-213-7/+38
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
generated by cgit v1.1 at 2024-12-27 02:01:37 +0000