Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 1 | -1/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Global creator information working on MySQL DB and on load/save OARs. ↵ | Diva Canto | 2010-11-21 | 1 | -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-refactor | Melanie | 2010-11-21 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Bump oar version to 1.0 from 0.5 | Justin Clark-Casey (justincc) | 2010-11-20 | 1 | -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-refactor | Melanie | 2010-11-18 | 1 | -43/+95 |
|\ \ \ \ | |/ / / | |||||
| * | | | Make "show queues [full]" behave like "show users [full]" | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -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-17 | 1 | -7/+11 |
| | | | | | | | | | | | | | | | | This should show the number of bytes sent to the client that it has not yet acknowledged. | ||||
| * | | | Fix "show queues" console command | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -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-refactor | Melanie | 2010-11-02 | 1 | -2/+3 |
|\ \ \ | |/ / | |||||
| * | | Old deserialization can't deal with commas in flag fields. Making use of ↵ | Diva Canto | 2010-11-02 | 1 | -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-refactor | Melanie | 2010-10-23 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 |
| |/ | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| * | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 1 | -1/+1 |
| | | |||||
| * | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 1 | -1/+1 |
| | | | |||||
| * | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 1 | -1/+1 |
| | | | |||||
| * | | Rip out version option since it turns out that the changed object ↵ | Justin Clark-Casey (justincc) | 2010-10-16 | 1 | -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. |