| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 6 | -4/+46 |
|\ \
| |/ |
|
| * | 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 |
| * | Fix default club feet | Melanie | 2010-11-02 | 1 | -1/+1 |
| * | Add support for cross-domain AJAX requests to REST console. | Marck | 2010-11-02 | 1 | -0/+31 |
| * | Support for CORS with simple requests in BaseHttpServer | Marck | 2010-11-02 | 1 | -0/+4 |
| * | Try to not make avatars switch outfits | Melanie | 2010-11-02 | 1 | -3/+0 |
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 2 | -16/+58 |
|\ \
| |/ |
|
| * | Fix logins and avatar appearance. Contains a Migration. May contain nuts. | Melanie | 2010-10-30 | 2 | -16/+58 |
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -4/+0 |
|\ \
| |/ |
|
| * | On first login, Ruth is back now. Strangely, inventory items are created for | Melanie | 2010-10-30 | 1 | -4/+0 |
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 5 | -319/+151 |
|\ \
| |/ |
|
| * | Logins work now, but avatars are green ugly gnomes. | Melanie | 2010-10-30 | 1 | -2/+0 |
| * | This commit fixes all the appearance related null refs. Still can't log in, | Melanie | 2010-10-30 | 2 | -3/+8 |
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 2 | -23/+16 |
| |\ |
|
| * | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 5 | -316/+145 |
* | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 2 | -23/+16 |
|\ \ \
| | |/
| |/| |
|
| * | | Rationalize the logging messages from the merged appearance branch, commentin... | Justin Clark-Casey (justincc) | 2010-10-29 | 2 | -23/+16 |
| |/ |
|
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -19/+116 |
|\ \
| |/ |
|
| * | Merge commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 4 | -157/+207 |
| |\ |
|
| | * | Bunch of fixes that reduce the number of times appearance | Master ScienceSim | 2010-10-29 | 1 | -18/+17 |
| * | | Add my work on top of cmickeyb's | Melanie | 2010-10-29 | 1 | -1/+99 |
| * | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 8 | -504/+602 |
| |\ \ |
|
| | * \ | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... | Melanie | 2010-10-21 | 8 | -504/+602 |
| | |\ \ |
|
| | * | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -5/+5 |
| | * | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-20 | 2 | -4/+29 |
| | * | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 2 | -6/+12 |
| * | | | | Revert "Preliminary work on appearance layers. No user functionality yet." | Melanie | 2010-10-29 | 1 | -193/+258 |
| * | | | | Preliminary work on appearance layers. No user functionality yet. | Melanie | 2010-10-29 | 1 | -258/+193 |
* | | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 8 | -546/+695 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | Configuration of persistent baked textures and save/send delays. | Master ScienceSim | 2010-10-28 | 1 | -1/+13 |
| * | | | | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 1 | -0/+2 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 3 | -38/+7 |
| |/ / /
|/| | | |
|
| * | | | Added background thread to handle delayed send and save of appearance | Master ScienceSim | 2010-10-28 | 1 | -4/+7 |
| * | | | Small cleanup and add more debugging information | Master ScienceSim | 2010-10-26 | 2 | -8/+23 |
| * | | | Half of the compatibility is working. Login into a new region with | Master ScienceSim | 2010-10-25 | 3 | -20/+28 |
| * | | | Intermediate commit for backward compatability; does not compile yet | Mic Bowman | 2010-10-25 | 2 | -62/+73 |
| * | | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 1 | -68/+70 |
| | |/
| |/| |
|
| * | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 8 | -504/+602 |
| |/ |
|
* | | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 3 | -7/+38 |
|\ \ |
|
| * | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -5/+5 |
| * | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 4 | -6/+146 |
| |\ \
| | |/ |
|
| * | | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 2 | -4/+29 |
| * | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-10 | 2 | -17/+21 |
| |\ \ |
|
| * \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -1/+36 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 1 | -0/+11 |
| |\ \ \ \ |
|
| * | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 2 | -6/+12 |
* | | | | | | Allow OARs and IARs to save and load meshes. | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -0/+2 |
| |_|_|_|/
|/| | | | |
|
* | | | | | Adding osFunctions for light projection | BlueWall | 2010-10-17 | 1 | -5/+50 |
* | | | | | Add missing check for !_projectionEntry | BlueWall | 2010-10-16 | 1 | -1/+1 |