aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-121-3/+4
|\
| * Drop current OAR version back to 0.5 since these are currently now ↵Justin Clark-Casey (justincc)2010-12-111-3/+4
| | | | | | | | | | | | compatible with older OpenSim versions again. Removed ability to choose 0.4 to avoid having to write code that polices this properly. Please shout on the ml if you really need this.
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-12-071-1/+1
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ 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
|/ / / / / | | | | | | | | | | | | | | | Prevents empty instances from hanging around when Mono.Addins messes up
* | | | | 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 ↵Justin Clark-Casey (justincc)2010-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | to make the association clear
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-031-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Also prevent god takes from ending up in Lost and Found
| * | | | Preservation of creator information now also working in IARs. Cleaned up ↵Diva Canto2010-11-291-3/+3
| | |_|/ | |/| | | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-221-1/+2
|\ \ \ \ | |/ / /
| * | | Global creator information working on MySQL DB and on load/save OARs. ↵Diva Canto2010-11-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Creator name properly shown on the viewer as first.last @authority. New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved Also closes save stream properly in the event of an error Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line e.g. save oar --version=0 oars/test.oar
* | | | 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
| | | | | | | | | | | | | | | | Now, "show queues" only shows root agents. "show queues full" will show child agents as well
| * | | add "Unacked bytes" column to "show queues"Justin Clark-Casey (justincc)2010-11-171-7/+11
| | | | | | | | | | | | | | | | This should show the number of bytes sent to the client that it has not yet acknowledged.
| * | | Fix "show queues" console commandJustin Clark-Casey (justincc)2010-11-171-32/+69
| | |/ | |/| | | | | | | | | | For each agent, this command shows how many packets have been sent/received and how many bytes remain in each of the send queues (resend, land, texture, etc.) Sometimes useful for diagnostics
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-2/+3
|\ \ \ | |/ /
| * | Old deserialization can't deal with commas in flag fields. Making use of ↵Diva Canto2010-11-021-2/+3
| | | | | | | | | | | | -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
* | | 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
| |/ | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * * 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 ↵Justin Clark-Casey (justincc)2010-10-161-3/+2
| | | | | | | | | | | | | | | | | | serialization format can actually be loaded by older OpenSims after all This bumps the OAR version to 0.4 instead, signalling some change but with backwards compatability... for now.
| * | change --old-guids switch on the save oar command line to --version=<x>Justin Clark-Casey (justincc)2010-10-161-2/+2
| | | | | | | | | | | | | | | | | | if x is 0, then an old version 0.3 archive is saved. If it is anything else or missing, then a version 1.0 archive is saved version 1.0 archives cannot be loaded on OpenSim 0.7.0.2 and earlier also add various informational notices about what version we've saving/loading
| * | Made OARs use the new serialization procedure. (TPs/crossings still on the ↵Diva Canto2010-10-151-2/+3
| |/ | | | | | | old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>.
* | 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
| | | | | | | | | | | | | | | | all the other default files" This reverts commit c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1. Reverted by agreement.
| * Move OpenSimDefaults,ini into config-include in order to put it with all the ↵Justin Clark-Casey (justincc)2010-09-141-1/+1
| | | | | | | | other default files
| * Add a missing parenthesisMelanie2010-09-131-1/+1
| |
| * Change the help message to point to copying OpenSimDefaults.ini.example.Melanie2010-09-131-1/+1
| | | | | | | | Provide a mostly empty OpenSim.ini.example
| * Output an error and quit if the master file is missing. Also renameMelanie2010-09-131-4/+16
| | | | | | | | OpenSim.ini.example to bin/OpenSimDefaults.ini.example
| * 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
| | | | | | | | | | position on backup. This way, ant object that has been moved will be checked for ghost prims as soon as it is persisted.
* | Change the help message to point to copying OpenSimDefaults.ini.example.Melanie2010-09-131-1/+1
| | | | | | | | Provide a mostly empty OpenSim.ini.example
* | Output an error and quit if the master file is missing. Also renameMelanie2010-09-131-4/+16
| | | | | | | | OpenSim.ini.example to bin/OpenSimDefaults.ini.example
* | Make the inimaster option default to OpenSimDefaults.ini.Melanie2010-09-131-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-134-40/+47
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * MergedJohn Hurliman2010-09-122-9/+9
| |\
| | * Formatting cleanup.Jeff Ames2010-09-122-9/+9
| | |
| * | * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-122-27/+33
| |/ | | | | | | | | * Removed StorageManager * CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings