aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-171-1/+2
|\
| * minor: 'debug packet' console command level <= 50 then don't log ImprovedTers...Justin Clark-Casey (justincc)2010-12-171-1/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-121-3/+4
|\ \ | |/
| * Drop current OAR version back to 0.5 since these are currently now compatible...Justin Clark-Casey (justincc)2010-12-111-3/+4
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2010-12-071-1/+1
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-1/+1
| |\ \ | | |/
| | * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-052-5/+5
| | |\
| | * \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-211-45/+98
| | |\ \
| | * \ \ Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-051-2/+3
| | |\ \ \
* | | | | | Cowardly refuse to keep running when no application plugins are loaded.Melanie2010-12-071-0/+6
|/ / / / /
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-041-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | minor: correction to logging categoryJustin Clark-Casey (justincc)2010-12-041-2/+2
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-041-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | minor: change OpenSimBase log messages associated with newer module loader to...Justin Clark-Casey (justincc)2010-12-031-2/+2
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-031-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Preservation of creator information now also working in IARs. Cleaned up usag...Diva Canto2010-11-291-3/+3
| | |_|/ | |/| |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-221-1/+2
|\ \ \ \ | |/ / /
| * | | Global creator information working on MySQL DB and on load/save OARs. Creator...Diva Canto2010-11-211-1/+2
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-211-2/+2
|\ \ \ \ | |/ / /
| * | | Bump oar version to 1.0 from 0.5Justin Clark-Casey (justincc)2010-11-201-2/+2
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-181-43/+95
|\ \ \ \ | |/ / /
| * | | Make "show queues [full]" behave like "show users [full]"Justin Clark-Casey (justincc)2010-11-171-11/+22
| * | | add "Unacked bytes" column to "show queues"Justin Clark-Casey (justincc)2010-11-171-7/+11
| * | | Fix "show queues" console commandJustin Clark-Casey (justincc)2010-11-171-32/+69
| | |/ | |/|
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-2/+3
|\ \ \ | |/ /
| * | Old deserialization can't deal with commas in flag fields. Making use of -ver...Diva Canto2010-11-021-2/+3
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-231-1/+1
|\ \ \ | |/ /
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-1/+1
| |/
| * * additional serveruri cleanupJonathan Freedman2010-10-031-1/+1
| * * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-021-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-1/+1
|\ \
| * | * additional serveruri cleanupJonathan Freedman2010-10-201-1/+1
| * | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-201-1/+1
| * | Rip out version option since it turns out that the changed object serializati...Justin Clark-Casey (justincc)2010-10-161-3/+2
| * | change --old-guids switch on the save oar command line to --version=<x>Justin Clark-Casey (justincc)2010-10-161-2/+2
| * | Made OARs use the new serialization procedure. (TPs/crossings still on the ol...Diva Canto2010-10-151-2/+3
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-211-1/+1
|\ \ | |/
| * Clarify help text for use of file paths with console command "create region".Marck2010-09-181-1/+1
| * Revert "Move OpenSimDefaults,ini into config-include in order to put it with ...Justin Clark-Casey (justincc)2010-09-141-1/+1
| * Move OpenSimDefaults,ini into config-include in order to put it with all the ...Justin Clark-Casey (justincc)2010-09-141-1/+1
| * Add a missing parenthesisMelanie2010-09-131-1/+1
| * Change the help message to point to copying OpenSimDefaults.ini.example.Melanie2010-09-131-1/+1
| * Output an error and quit if the master file is missing. Also renameMelanie2010-09-131-4/+16
| * Make the inimaster option default to OpenSimDefaults.ini.Melanie2010-09-131-1/+1
* | Fix a small left over buglet and also add checking of the physics actorMelanie Thielker2010-09-141-1/+1
* | Change the help message to point to copying OpenSimDefaults.ini.example.Melanie2010-09-131-1/+1
* | Output an error and quit if the master file is missing. Also renameMelanie2010-09-131-4/+16
* | Make the inimaster option default to OpenSimDefaults.ini.Melanie2010-09-131-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-134-40/+47
|\ \ | |/
| * MergedJohn Hurliman2010-09-122-9/+9
| |\