aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | It contains a major interface version bump and will NOT work with earlier grid services. This is preliminary work that will lead to layers support. Rest appearance services are commented out completely, they will have to be adapted by someone who actually uses them. Remote admin is working, but has no layers support. There is no layers support in the database. Login likely won't work. You have been warned.
* | | 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 ↵Justin Clark-Casey (justincc)2010-10-301-5/+6
| | | | | | | | appropriate debug to reduce console spam when log level is info
* | Rationalize the logging messages from the merged appearance branch, ↵Justin Clark-Casey (justincc)2010-10-291-29/+18
| | | | | | | | commenting out most of them as per Mic
* | 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 ↵Justin Clark-Casey (justincc)2010-10-293-5/+5
| | | | | | | | diagnostics easier
* | Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-292-43/+62
| | | | | | | | | | and avatar data are sent. And the number of times they are stored.
* | 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
| | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * Merge remote branch 'otakup0pe/mantis5110'Justin Clark-Casey (justincc)2010-10-225-50/+26
| |\
| | * 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
| | | | | | | | | | | | |
| | | * | | | | | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-022-21/+8
| | | | | | | | | | | | |
| | * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
| | * | | | | | | | | | | 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
| | | | | | | | | | | | |
| | * | | | | | | | | | | Allow region modules to know which agents actually receive chatJustin Clark-Casey (justincc)2010-10-221-8/+36
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Revert "* refactor refactor refactor ServerURI 4 lyfe"Justin Clark-Casey (justincc)2010-10-222-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 55974df14b6d64c1e1f9e386a3eacce3ba86dc98.
| * | | | | | | | | | | Revert "* additional serveruri cleanup"Justin Clark-Casey (justincc)2010-10-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 19119d7705f8381a3c207d0e64a23243215a12b9.
| * | | | | | | | | | | Revert "* more url / hg cleanup"Justin Clark-Casey (justincc)2010-10-222-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 58f75fa19d9aea18283ecdbd44559efb81781c9d.
| * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
| * | | | | | | | | | | 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 ↵Justin Clark-Casey (justincc)2010-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clear that the oar will not be usable
| * | | | | | | | | | | 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
| |/ / / / / / / / / /
* | | | | | | | | | | Added background thread to handle delayed send and save of appearanceMaster ScienceSim2010-10-281-55/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to accommodate batching of the many updates that happen on login and teleport. Fixed handling of the serial property in appearance.
* | | | | | | | | | | Made the check for texture assets asynchronous. This is one part ofMaster ScienceSim2010-10-261-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a bigger clean up that needs to happen around locks on appearance.
* | | | | | | | | | | Half of the compatibility is working. Login into a new region withMaster ScienceSim2010-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old data works. Teleport out of a new region with old data works. Teleport into a new region with old data does not trigger the necessary rebake.