Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 2 | -95/+158 |
|\ | |||||
| * | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 2 | -95/+158 |
| |\ | |||||
| | * | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... | Melanie | 2010-10-21 | 2 | -95/+158 |
| | |\ | |||||
| | | * | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 2 | -95/+158 |
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-27 | 3 | -7/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | Formatting cleanup. | Jeff Ames | 2010-10-27 | 3 | -7/+7 |
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 4 | -18/+86 |
|\ \ \ \ | |/ / / | |||||
| * | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -3/+3 |
| * | | | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 1 | -3/+3 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 1 | -17/+65 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 1 | -0/+329 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-18 | 1 | -3/+3 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 3 | -0/+480 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-10 | 1 | -2/+10 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 2 | -7/+7 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 1 | -3/+3 |
| * | | | | | | | | | print IAR version number on console when saving | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+6 |
| * | | | | | | | | | Implement guard against trying to load incompatible version IARs | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+19 |
| * | | | | | | | | | start parsing iar control file | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+19 |
| * | | | | | | | | | write IAR control file first in the archive rather than last | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -4/+6 |
| * | | | | | | | | | Allow region modules to know which agents actually receive chat | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -8/+36 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 3 | -5/+384 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 1 | -3/+3 |
| |/ / / / / / / | |||||
| * | | | | | | | * One more goofy thing. I note that the sculpt texture id is broken out of t... | Teravus Ovares (Dan Olivares) | 2010-10-20 | 1 | -1/+4 |
| * | | | | | | | * This removes an ugly extraparams hack that I used and makes UploadObjectAss... | Teravus Ovares (Dan Olivares) | 2010-10-20 | 1 | -17/+62 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | * This concludes UploadObjectAsset for now until the permissions and physics ... | Teravus Ovares (Dan Olivares) | 2010-10-19 | 1 | -48/+76 |
| * | | | | | | * Almost complete implementation of UploadObjectAsset cap. all meshes get u... | Teravus Ovares (Dan Olivares) | 2010-10-18 | 1 | -0/+301 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Stop the InventoryTransferModule logging every IM notification it receives, e... | Justin Clark-Casey (justincc) | 2010-10-19 | 1 | -3/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 3 | -0/+480 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | A couple of more ways attachment point is sent | Latif Khalifa | 2010-10-15 | 1 | -0/+8 |
| * | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -3/+7 |
| |\ \ \ \ | |||||
| | * | | | | Don't distroy attachments when using viewer 2.1+, strip multiple attachment data | Latif Khalifa | 2010-10-14 | 1 | -0/+4 |
| | * | | | | Kill some magic numbers in the mesh upload module and change the mesh asset | Melanie | 2010-10-14 | 1 | -3/+3 |
| * | | | | | * Replacing Magic numbers with Enums | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -4/+4 |
| |/ / / / | |||||
| * | | | | * A few additional cleanup elements | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -0/+6 |
| * | | | | * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST' | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -1/+1 |
| * | | | | * Tweaked the upload response and now at least uploading the mesh works. | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -16/+21 |
| * | | | | Rename file + more testing and tweaking | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -9/+17 |
| * | | | | * Partially complete stuff for Mesh support that Melanie wanted to see before... | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -0/+449 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... | Melanie | 2010-10-10 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Add group invites to the list of messages that get offlined | Melanie | 2010-10-10 | 1 | -0/+1 |
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-10 | 1 | -2/+10 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Fix a typo in previouis commit: start must not pass the end of the file | Latif Khalifa | 2010-10-09 | 1 | -2/+2 |
| * | | | weird line endings fix commit | Teravus Ovares (Dan Olivares) | 2010-10-09 | 1 | -7/+7 |
| * | | | Return error code instead of the last byte of the file if range is not satisf... | Latif Khalifa | 2010-10-09 | 1 | -1/+9 |
| * | | | In case when 1 single byte is requested (yes viewer does this) | Latif Khalifa | 2010-10-09 | 1 | -2/+2 |
| | |/ | |/| | |||||
* | | | Make SendKillObject send multiple localIDs in one packet. This avoids the | Melanie | 2010-10-08 | 1 | -1/+1 |
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 2 | -7/+7 |
|\ \ \ | |/ / | |||||
| * | | Formatting cleanup. | Jeff Ames | 2010-10-04 | 2 | -7/+7 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-30 | 1 | -0/+3 |
|\ \ | |/ |