aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase y...Diva Canto2010-12-081-1/+1
* Added ability for GetTexture to serve multiple formats. The format may come a...Diva Canto2010-12-081-42/+202
* Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-055-101/+145
|\
| * Various bug fixes for appearance handling: more aggressive reset of textures ...Mic Bowman2010-12-031-36/+63
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-291-24/+6
| |\
| | * Refactor appearance and avatar data sending code. Paritioning the routines in...Mic Bowman2010-11-271-24/+6
| * | Fix unit test.Diva Canto2010-11-293-9/+16
| * | Preservation of creator information now also working in IARs. Cleaned up usag...Diva Canto2010-11-294-35/+63
| |/
* | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-231-55/+50
|\ \ | |/
| * Only perform the take object permissions check if an object is being attached...Justin Clark-Casey (justincc)2010-11-231-55/+50
* | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-213-77/+94
|\ \ | |/
| * Global creator information working on MySQL DB and on load/save OARs. Creator...Diva Canto2010-11-211-2/+8
| * Fixed appearance send for avatars with only default textures. This should fix...Master ScienceSim2010-11-181-53/+74
| * Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-22/+12
* | Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-212-36/+39
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-11-082-33/+32
| * Detach attachments displaced by other attachmentsMelanie2010-11-081-4/+8
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-5/+10
|\ \ | |/
| * Fix logins and avatar appearance. Contains a Migration. May contain nuts.Melanie2010-10-301-5/+10
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-302-32/+5
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-301-10/+5
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-301-29/+18
| | |\
| | * | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-301-10/+5
| * | | minor: remove some old commented out codeJustin Clark-Casey (justincc)2010-10-301-22/+0
| | |/ | |/|
* | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-29/+18
|\ \ \ | |/ /
| * | Rationalize the logging messages from the merged appearance branch, commentin...Justin Clark-Casey (justincc)2010-10-291-29/+18
| |/
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-292-43/+62
|\ \ | |/
| * Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-292-43/+62
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-295-101/+286
|\ \ | |/
| * Configuration of persistent baked textures and save/send delays.Master ScienceSim2010-10-281-4/+14
| * Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-283-14/+83
| |\
| | * Formatting cleanup.Jeff Ames2010-10-273-7/+7
| | * Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-3/+3
| |/ |/|
| * Added background thread to handle delayed send and save of appearanceMaster ScienceSim2010-10-281-55/+164
| * Made the check for texture assets asynchronous. This is one part ofMaster ScienceSim2010-10-261-7/+10
| * Half of the compatibility is working. Login into a new region withMaster ScienceSim2010-10-251-1/+1
| * Major refactoring of appearance handling.Master ScienceSim2010-10-202-95/+158
* | 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
| |_|_|_|_|_|/ |/| | | | | |