aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into mantis5110Jonathan Freedman2010-10-303-37/+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-305-39/+29
| | |\
| | * | 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
| | |/ | |/|
| * | Change level of some logging messages, turning some info into arguably more a...Justin Clark-Casey (justincc)2010-10-301-5/+6
* | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-294-34/+23
|\ \ \ | |/ /
| * | Rationalize the logging messages from the merged appearance branch, commentin...Justin Clark-Casey (justincc)2010-10-291-29/+18
| * | Merge branch 'justincc-dev'Justin Clark-Casey (justincc)2010-10-293-5/+5
| |\ \ | | |/ | |/|
| | * for now, comment out some older or redundant log debug lines to make diagnost...Justin Clark-Casey (justincc)2010-10-293-5/+5
* | | 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-298-144/+317
|\ \ \ | |/ /
| * | Configuration of persistent baked textures and save/send delays.Master ScienceSim2010-10-281-4/+14
| * | Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-287-71/+111
| |\ \ | | |/
| | * Formatting cleanup.Jeff Ames2010-10-275-50/+27
| | * Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-225-26/+50
| * | 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-203-95/+169
* | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-241-1/+1
|\ \ \ | | |/ | |/|
| * | Merge remote branch 'otakup0pe/mantis5110'Justin Clark-Casey (justincc)2010-10-225-50/+26
| |\ \
| * | | Revert "* refactor refactor refactor ServerURI 4 lyfe"Justin Clark-Casey (justincc)2010-10-222-8/+21
| * | | Revert "* additional serveruri cleanup"Justin Clark-Casey (justincc)2010-10-222-4/+4
| * | | Revert "* more url / hg cleanup"Justin Clark-Casey (justincc)2010-10-222-12/+26
| * | | 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-222-3/+20
| * | | start parsing iar control fileJustin Clark-Casey (justincc)2010-10-222-2/+20
| * | | slightly simplify oar control file loading codeJustin Clark-Casey (justincc)2010-10-221-10/+3
| * | | write IAR control file first in the archive rather than lastJustin Clark-Casey (justincc)2010-10-222-5/+8
| * | | minor: add some text to the oar abort messages on assets timeout to make it c...Justin Clark-Casey (justincc)2010-10-221-1/+1
| * | | Allow region modules to know which agents actually receive chatJustin Clark-Casey (justincc)2010-10-221-8/+36
| * | | * more url / hg cleanupJonathan Freedman2010-10-202-26/+12
| * | | * additional serveruri cleanupJonathan Freedman2010-10-202-4/+4
| * | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-202-21/+8
| | |/ | |/|
* | | * throw debug message when no HomeURI is setJonathan Freedman2010-10-241-0/+2
| |/ |/|
* | Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-225-50/+26
|\ \
| * | * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-212-5/+8
| * | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-202-19/+67
| |\ \ | | |/
| * | 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-1710-60/+609
| |\ \ \ \
| * | | | | * more url / hg cleanupJonathan Freedman2010-10-112-26/+12
| * | | | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-102-3/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-074-27/+80
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-052-3/+18
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-057-16/+35
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0311-68/+1448
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | * additional serveruri cleanupJonathan Freedman2010-10-032-4/+4