Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge | Melanie | 2011-10-12 | 1 | -3/+3 | |
|\ \ | |/ | ||||||
| * | remove the pointless slashes on the end of the (5!) different server stat ↵ | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | retrieval mechanisms. Original request URLs that end with / will still work, but this will allow one to type /simstatus as well as /simstatus/ Can't do this with webstats yet since it does insane things to the path. | |||||
* | | Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | Add user ID to new estate user prompt, to make it clearer and consistent ↵ | Justin Clark-Casey (justincc) | 2011-10-05 | 1 | -1/+1 | |
| | | | | | | | | with the main create user prompts | |||||
* | | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+10 | |
|\ \ | |/ | ||||||
| * | When creating a new user on the comand line, give the option of allowing a ↵ | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+10 | |
| | | | | | | | | | | | | UUID to be specified to override the randomly generated one. This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership. | |||||
* | | Merge commit '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmerge | Melanie | 2011-10-11 | 1 | -9/+0 | |
|\ \ | |/ | ||||||
| * | Remove the unimplented "clear assets" command. | Justin Clark-Casey (justincc) | 2011-09-24 | 1 | -9/+0 | |
| | | | | | | | | | | This was a bizarre relic of a bygone age that had no implementations. If you're using and want to clear the flotsam asset cache then please use the existing "fcache clear" command | |||||
* | | Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+2 | |
|\ \ | |/ | ||||||
| * | Fix build errors on Windows by adding missing OpenSim.Services.Base reference | justincc | 2011-09-16 | 1 | -1/+2 | |
| | | ||||||
* | | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+11 | |
|\ \ | |/ | ||||||
| * | Pass any region scope through to the CreateUser() method | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -2/+11 | |
| | | ||||||
* | | Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmerge | Melanie | 2011-10-11 | 1 | -45/+50 | |
|\ \ | |/ | ||||||
| * | refactor: move estate owner setup code into separate method | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -45/+50 | |
| | | ||||||
* | | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+50 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs | |||||
| * | Correctly create a freshly created estate owner's default items and avatar ↵ | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -0/+50 | |
| | | | | | | | | entries on standalone if applicable. | |||||
* | | Bring us up to date. | Tom | 2011-09-14 | 2 | -4/+8 | |
|\ \ | |/ | ||||||
| * | When creating an OAR, optionally exclude objects according to their permissions | Oren Hurvitz | 2011-09-12 | 1 | -4/+6 | |
| | | ||||||
| * | Delay loading scripts until the scene has finished loading | Oren Hurvitz | 2011-09-09 | 1 | -0/+2 | |
| | | ||||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 2 | -1/+21 | |
|\ \ | |/ | ||||||
| * | prevent "create region" console command from being able to create a region ↵ | Justin Clark-Casey (justincc) | 2011-08-06 | 1 | -1/+15 | |
| | | | | | | | | | | | | with the same id as one that already exists. Addresses http://opensimulator.org/mantis/view.php?id=5617 | |||||
| * | Temporarily put in a log line which shows which locale the user is running in. | Justin Clark-Casey (justincc) | 2011-07-29 | 2 | -0/+6 | |
| | | ||||||
* | | Add a timer to monitor the heartbeat. Restart it if it's been dead for | Melanie | 2011-07-25 | 1 | -0/+1 | |
| | | | | | | | | 5 seconds. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-05 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | Make default serverside_object_permissions = true since this better matches ↵ | Justin Clark-Casey (justincc) | 2011-07-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | user expectations. It also matches the default setting in the OpenSim.ini.example file | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 2 | -2/+6 | |
|\ \ | |/ | ||||||
| * | Write estate errors on startup to the log | Oren Hurvitz | 2011-06-07 | 1 | -2/+2 | |
| | | ||||||
| * | Adding boolean alias for commandline switches like -save_crashes=yes | Makopoppo | 2011-06-01 | 1 | -0/+2 | |
| | | ||||||
| * | Fix: The command line switches 'save_crashes' and 'crash_dir' haven't ↵ | Makopoppo | 2011-06-01 | 1 | -0/+2 | |
| | | | | | | | | actually worked | |||||
* | | 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 | |
|\ \ | |/ |