Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-27 | 1 | -4/+5 |
|\ | |||||
| * | Add a --noassets option to "save oar". | Justin Clark-Casey (justincc) | 2011-05-26 | 1 | -4/+5 |
| | | | | | | | | | | This switch stops any assets being saved in the oar. This can be useful if you're using OAR to backup regions and you know you'll always have the original asset database available. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-08 | 1 | -15/+1 |
|\ \ | |/ | |||||
| * | remove obsolete [StandAlone] config section parsing, none of which was ↵ | Justin Clark-Casey (justincc) | 2011-05-06 | 1 | -15/+1 |
| | | | | | | | | actually used since being superseded by the connector architecture in 0.7 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-12 | 1 | -5/+13 |
|\ \ | |/ | |||||
| * | create "config show" as a region console command synonym for "config get". | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -5/+13 |
| | | | | | | | | This is to create greater consistency with all the other show commands. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-08 | 1 | -11/+3 |
|\ \ | |/ | |||||
| * | trivial whitespace removal to trigger a panda rebuild | Justin Clark-Casey (justincc) | 2011-04-08 | 1 | -11/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-03 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Comment out some startup logging lines to make up for the one I added ↵ | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | earlier on. Most of these are where the region modules are telling us they are disabled. Convention is only to log when enabled (even that is really noisy) | ||||
| * | When asked to join region to existing estate, make first estate name the ↵ | Justin Clark-Casey (justincc) | 2011-04-01 | 1 | -5/+2 |
| | | | | | | | | default instead of None | ||||
| * | Make default answer for 'do you wish to join region to an existing estate' ↵ | Justin Clark-Casey (justincc) | 2011-04-01 | 1 | -1/+1 |
| | | | | | | | | yes instead of no. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 1 | -38/+87 |
|\ \ | |/ | |||||
| * | On initial setup, include estate and regions names in questions to make it ↵ | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -4/+6 |
| | | | | | | | | clearer what they relate to. | ||||
| * | In initial setup, stop a user being able to create a new estate with the ↵ | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -14/+31 |
| | | | | | | | | same name as an existing estate. | ||||
| * | On initial opensim setup, don't ask the user whether they want to join an ↵ | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -39/+63 |
| | | | | | | | | existing opensim estate when there aren't any. Proceed directly to estate setup instead. | ||||
| * | refactor: use EstateDataService property directly instead of loading it into ↵ | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -12/+7 |
| | | | | | | | | a local variable | ||||
| * | On initial region registration, if the user chooses the option to make the ↵ | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -1/+12 |
| | | | | | | | | region part of an existing estate, then list the existing region names. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-16 | 1 | -4/+8 |
|\ \ | |/ | |||||
| * | Fix bug where "My estate" name was always used even if the user entered a ↵ | Justin Clark-Casey (justincc) | 2011-02-12 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | different name on initial setup. Turns out we had stopped saving estate settings immediately after the name change. The scene constructor then reloade the settings and oblitereted the different name. This code could be more efficient since there's no reason for scene to reload the settings when they are already known to be valid. Thanks to Thoneve for the spot on this. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-12 | 1 | -2/+3 |
|\ \ | |/ | |||||
| * | add estate name to show regions console command | Justin Clark-Casey (justincc) | 2011-02-11 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -0/+72 |
|\ \ | |/ | |||||
| * | New command: show pending-objects | Diva Canto | 2011-02-06 | 1 | -0/+22 |
| | | |||||
| * | Added a couple of console commands to help diagnose issues: | Diva Canto | 2011-02-05 | 1 | -0/+50 |
| | | | | | | | | | | show circuits: shows the lists of agent circuit data show http-handlers: shows the currently registered http handlers | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-29 | 1 | -4/+15 |
|\ \ | |/ | |||||
| * | minor: don't bother reparsing the sources for includes if ReadConfig() was ↵ | Justin Clark-Casey (justincc) | 2011-01-28 | 1 | -2/+3 |
| | | | | | | | | unsuccessful | ||||
| * | If a non-globbed included file from config cannot be found then warn the user | Justin Clark-Casey (justincc) | 2011-01-28 | 1 | -3/+13 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-23 | 1 | -129/+44 |
|\ \ | |/ | |||||
| * | Update the "config get <section> <key>" command to "config get [<section>] ↵ | Justin Clark-Casey (justincc) | 2011-01-21 | 1 | -22/+44 |
| | | | | | | | | | | | | | | | | | | [<key>]" The config get command shows a current config value on the console. Now, if <key> is omitted then all the values for the given section are printed. If <section> is ommitted then all sections and all keys are printed. Current config can also be dumped to a file using "config save <path>". This can be handy for resolving or eliminating config issues | ||||
| * | Move "show queues" command out of OpenSim.cs and into a separate module. | Justin Clark-Casey (justincc) | 2011-01-20 | 1 | -99/+0 |
| | | |||||
| * | remove unimplemented "show assets" command | Justin Clark-Casey (justincc) | 2011-01-20 | 1 | -8/+0 |
| | | |||||
| * | Correct "show queues" to show queued packet numbers for each client instead ↵ | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -12/+12 |
| | | | | | | | | | | | | of bytes. Byte amounts aren't actually available - this was a misunderstanding of TokenBucket.Content. But raw packet numbers are. | ||||
| * | Fixes the issue of hung archives. Problem was with SceneObjectSerializer. | Diva Canto | 2011-01-08 | 1 | -1/+1 |
| | | | | | | | | Also fixes a buglet in scene load xml command, where it was given the wrong argument index for filename. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-17 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | minor: 'debug packet' console command level <= 50 then don't log ↵ | Justin Clark-Casey (justincc) | 2010-12-17 | 1 | -1/+2 |
| | | | | | | | | ImprovedTerseObjectUpdate messages | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -3/+4 |
|\ \ | |/ | |||||
| * | Drop current OAR version back to 0.5 since these are currently now ↵ | Justin Clark-Casey (justincc) | 2010-12-11 | 1 | -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 ↵ | Melanie | 2010-12-07 | 1 | -1/+1 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 2 | -5/+5 |
| | |\ | |||||
| | * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -45/+98 |
| | |\ \ | |||||
| | * \ \ | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 1 | -2/+3 |
| | |\ \ \ | |||||
* | | | | | | Cowardly refuse to keep running when no application plugins are loaded. | Melanie | 2010-12-07 | 1 | -0/+6 |
|/ / / / / | | | | | | | | | | | | | | | | Prevents empty instances from hanging around when Mono.Addins messes up | ||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-04 | 1 | -2/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | minor: correction to logging category | Justin Clark-Casey (justincc) | 2010-12-04 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-04 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | minor: change OpenSimBase log messages associated with newer module loader ↵ | Justin Clark-Casey (justincc) | 2010-12-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | to make the association clear | ||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 1 | -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 Canto | 2010-11-29 | 1 | -3/+3 |
| | |_|/ | |/| | | | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. |