Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 1 | -115/+160 | |
| |\ | ||||||
| * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -0/+23 | |
| |\ \ | ||||||
| * \ \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 1 | -29/+34 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -11/+11 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -10/+16 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -20/+46 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -118/+51 | |
| |\ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | Apply the useful part of diva's patch that was skipped | Melanie | 2010-12-12 | 1 | -27/+1 | |
* | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-04 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| * | | | | | | | | | Various bug fixes for appearance handling: more aggressive reset of textures ... | Mic Bowman | 2010-12-03 | 1 | -16/+30 | |
* | | | | | | | | | | Various bug fixes for appearance handling | Mic Bowman | 2010-11-30 | 1 | -16/+30 | |
* | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-27 | 1 | -21/+24 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Reformat an overzealous comment. Remove end of line marks and reference to the | Melanie | 2010-11-27 | 1 | -21/+24 | |
* | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-27 | 1 | -10/+27 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | llUnsit position fix 4063 (updated 11-20-2010) | Micheil Merlin | 2010-11-27 | 1 | -2/+27 | |
| * | | | | | | | | | Refactor appearance and avatar data sending code. Paritioning the routines in... | Mic Bowman | 2010-11-27 | 1 | -114/+117 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
| * | | | | | | | | Prevent leftover attachments from clogging up the pipes | Melanie | 2010-11-16 | 1 | -1/+4 | |
| * | | | | | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -0/+20 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Prevent an overlength button label from producing a debug dump and aborting | Melanie | 2010-11-24 | 1 | -115/+118 | |
* | | | | | | | | Send parcel data upon becoming root. This will make streams play and build | Melanie | 2010-11-18 | 1 | -3/+5 | |
* | | | | | | | | Prevent leftover attachments from clogging up the pipes | Melanie | 2010-11-16 | 1 | -1/+4 | |
* | | | | | | | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Melanie | 2010-11-16 | 1 | -2/+16 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Kitto Flora | 2010-11-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix excessive forward motion and flailing while descending a slope, prevent a... | Kitto Flora | 2010-11-11 | 1 | -2/+16 | |
* | | | | | | | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -0/+18 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | ||||||
| * | | | | | | | Formatting cleanup. | Jeff Ames | 2010-11-08 | 1 | -1/+1 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Fix merge artefacts | Melanie | 2010-11-05 | 1 | -55/+18 | |
* | | | | | | | Revert "Fix for hanging on "Connecting to region".. caused by packets being p... | Melanie | 2010-11-05 | 1 | -26/+58 | |
* | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-03 | 1 | -0/+9 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Actually calculate the height before setting it, this isn't done automatically | Melanie | 2010-11-03 | 1 | -1/+7 | |
| * | | | | | | Trying to prevent a wrong physical actor size | Melanie | 2010-11-03 | 1 | -0/+3 | |
* | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 1 | -4/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Fix avatar height management | Melanie | 2010-11-02 | 1 | -24/+11 | |
* | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 1 | -48/+50 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Fix sitting and standing up | Melanie | 2010-11-02 | 1 | -5/+14 | |
| | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | Move physics actor creation to after SetHeight to try and prevent | Melanie | 2010-10-30 | 1 | -11/+11 | |
| | |_|_|/ | |/| | | | ||||||
| * | | | | tweak a few more scene presence logging messages for consistency | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -3/+3 | |
| * | | | | Rationalize the logging messages from the merged appearance branch, commentin... | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -5/+5 | |
| * | | | | Merge branch 'justincc-dev' | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -3/+9 | |
| |\ \ \ \ | | |_|_|/ | |/| | | | ||||||
| | * | | | add timing report to CompleteScenePresence for diagnostic purposes | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -1/+8 | |
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -23/+50 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 1 | -23/+50 | |
| |\ \ \ \ | ||||||
| | * | | | | Clean up some cruft from the last commit. Re-add the initial update | Master ScienceSim | 2010-10-29 | 1 | -2/+2 | |
| | * | | | | Bunch of fixes that reduce the number of times appearance | Master ScienceSim | 2010-10-29 | 1 | -20/+46 | |
| | | |_|/ | | |/| | | ||||||
| | * | | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 1 | -4/+5 | |
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -123/+48 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 1 | -114/+48 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... | Melanie | 2010-10-21 | 1 | -115/+50 | |
| | |\ \ \ | | | |/ / |