aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Change inworld restart to use blue boxes rather than notices to match SLMelanie2010-11-291-2/+2
* Implement god summonsMelanie2010-11-281-7/+21
* Convert the scope id in the im session id to a URL variable. Fixes offlineMelanie2010-11-261-10/+2
* Prevent an overlength button label from producing a debug dump and abortingMelanie2010-11-241-24/+6
* Merge branch 'master' into careminster-presence-refactorMelanie2010-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' into careminster-presence-refactorMelanie2010-11-221-2/+8
|\ \ | |/
| * Global creator information working on MySQL DB and on load/save OARs. Creator...Diva Canto2010-11-211-2/+8
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-181-53/+74
|\ \ | |/
| * 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
* | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-28/+12
* | When detaching a scripted item, always consider it modified. Script statesMelanie2010-11-161-1/+7
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-092-33/+32
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-11-082-33/+32
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-081-4/+8
|\ \ | |/
| * Detach attachments displaced by other attachmentsMelanie2010-11-081-4/+8
* | Fix the inventory transfer module to not cause duplicated text IMsMelanie2010-11-051-3/+6
* | Fix avatar to avatar inventory gives across serversMelanie2010-11-041-8/+50
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-022-66/+33
|\ \ | |/
| * Fix logins and avatar appearance. Contains a Migration. May contain nuts.Melanie2010-10-301-5/+10
| * 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
| | |/ | |/|
| * | Rationalize the logging messages from the merged appearance branch, commentin...Justin Clark-Casey (justincc)2010-10-291-29/+18
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-292-84/+225
|\ \ | |/
| * Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-292-43/+62
| * 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
| |\
| * | 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
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-292-95/+158
|\ \ \
| * \ \ Merge branch 'dev-appearance'Melanie2010-10-292-95/+158
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a...Melanie2010-10-212-95/+158
| | |\ \ | | | |/
| | | * Major refactoring of appearance handling.Master ScienceSim2010-10-202-95/+158
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-273-7/+7
|\ \ \ \ | |/ / /
| * | | Formatting cleanup.Jeff Ames2010-10-273-7/+7
* | | | 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