aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-234-18/+86
|\
| * Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-3/+3
| * Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-221-3/+3
| |\
| | * Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-201-17/+65
| | |\
| | * \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-201-0/+329
| | |\ \
| | * \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-181-3/+3
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-173-0/+480
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-101-2/+10
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-052-7/+7
| | |\ \ \ \ \ \
| | * | | | | | | * additional serveruri cleanupJonathan Freedman2010-10-031-3/+3
| * | | | | | | | print IAR version number on console when savingJustin Clark-Casey (justincc)2010-10-221-2/+6
| * | | | | | | | Implement guard against trying to load incompatible version IARsJustin Clark-Casey (justincc)2010-10-221-2/+19
| * | | | | | | | start parsing iar control fileJustin Clark-Casey (justincc)2010-10-221-1/+19
| * | | | | | | | write IAR control file first in the archive rather than lastJustin Clark-Casey (justincc)2010-10-221-4/+6
| * | | | | | | | Allow region modules to know which agents actually receive chatJustin Clark-Casey (justincc)2010-10-221-8/+36
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-213-5/+384
|\ \ \ \ \ \ \ \
| * | | | | | | | * additional serveruri cleanupJonathan Freedman2010-10-201-3/+3
| |/ / / / / / /
| * | | | | | | * One more goofy thing. I note that the sculpt texture id is broken out of t...Teravus Ovares (Dan Olivares)2010-10-201-1/+4
| * | | | | | | * This removes an ugly extraparams hack that I used and makes UploadObjectAss...Teravus Ovares (Dan Olivares)2010-10-201-17/+62
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | * This concludes UploadObjectAsset for now until the permissions and physics ...Teravus Ovares (Dan Olivares)2010-10-191-48/+76
| * | | | | | * Almost complete implementation of UploadObjectAsset cap. all meshes get u...Teravus Ovares (Dan Olivares)2010-10-181-0/+301
| | |_|_|_|/ | |/| | | |
| * | | | | Stop the InventoryTransferModule logging every IM notification it receives, e...Justin Clark-Casey (justincc)2010-10-191-3/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-163-0/+480
|\ \ \ \ \ | |/ / / /
| * | | | A couple of more ways attachment point is sentLatif Khalifa2010-10-151-0/+8
| * | | | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-142-3/+7
| |\ \ \ \
| | * | | | Don't distroy attachments when using viewer 2.1+, strip multiple attachment dataLatif Khalifa2010-10-141-0/+4
| | * | | | Kill some magic numbers in the mesh upload module and change the mesh assetMelanie2010-10-141-3/+3
| * | | | | * Replacing Magic numbers with EnumsTeravus Ovares (Dan Olivares)2010-10-142-4/+4
| |/ / / /
| * | | | * A few additional cleanup elementsTeravus Ovares (Dan Olivares)2010-10-142-0/+6
| * | | | * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST'Teravus Ovares (Dan Olivares)2010-10-141-1/+1
| * | | | * Tweaked the upload response and now at least uploading the mesh works.Teravus Ovares (Dan Olivares)2010-10-142-16/+21
| * | | | Rename file + more testing and tweakingTeravus Ovares (Dan Olivares)2010-10-141-9/+17
| * | | | * Partially complete stuff for Mesh support that Melanie wanted to see before...Teravus Ovares (Dan Olivares)2010-10-142-0/+449
| | |_|/ | |/| |
* | | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-10-101-0/+1
|\ \ \ \
| * | | | Add group invites to the list of messages that get offlinedMelanie2010-10-101-0/+1
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-101-2/+10
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Fix a typo in previouis commit: start must not pass the end of the fileLatif Khalifa2010-10-091-2/+2
| * | | weird line endings fix commitTeravus Ovares (Dan Olivares)2010-10-091-7/+7
| * | | Return error code instead of the last byte of the file if range is not satisf...Latif Khalifa2010-10-091-1/+9
| * | | In case when 1 single byte is requested (yes viewer does this)Latif Khalifa2010-10-091-2/+2
| | |/ | |/|
* | | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-081-1/+1
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-062-7/+7
|\ \ \ | |/ /
| * | Formatting cleanup.Jeff Ames2010-10-042-7/+7
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-301-0/+3
|\ \ | |/
| * Prevent dropping someone else's attachmentsMelanie2010-09-301-0/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-271-1/+1
|\ \ | |/
| * Quash the region ID on intersim messages. That prevents people from determiningMelanie2010-09-271-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-261-1/+2
|\ \ | |/
| * When receiving intersim IM, don't let the spoof protection bombMelanie2010-09-261-1/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-251-1/+2
|\ \ | |/