aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmergeMelanie2011-10-121-3/+3
|\
| * remove the pointless slashes on the end of the (5!) different server stat ↵Justin Clark-Casey (justincc)2011-10-071-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 bigmergeMelanie2011-10-121-1/+1
|\ \ | |/
| * Add user ID to new estate user prompt, to make it clearer and consistent ↵Justin Clark-Casey (justincc)2011-10-051-1/+1
| | | | | | | | with the main create user prompts
* | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmergeMelanie2011-10-121-1/+10
|\ \ | |/
| * When creating a new user on the comand line, give the option of allowing a ↵Justin Clark-Casey (justincc)2011-10-041-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 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmergeMelanie2011-10-111-1/+2
|\ \ | |/
| * Fix build errors on Windows by adding missing OpenSim.Services.Base referencejustincc2011-09-161-1/+2
| |
* | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmergeMelanie2011-10-111-2/+11
|\ \ | |/
| * Pass any region scope through to the CreateUser() methodJustin Clark-Casey (justincc)2011-09-161-2/+11
| |
* | Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmergeMelanie2011-10-111-45/+50
|\ \ | |/
| * refactor: move estate owner setup code into separate methodJustin Clark-Casey (justincc)2011-09-161-45/+50
| |
* | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-111-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-161-0/+50
| | | | | | | | entries on standalone if applicable.
* | Bring us up to date.Tom2011-09-141-0/+2
|\ \ | |/
| * Delay loading scripts until the scene has finished loadingOren Hurvitz2011-09-091-0/+2
| |
* | Add a timer to monitor the heartbeat. Restart it if it's been dead forMelanie2011-07-251-0/+1
| | | | | | | | 5 seconds.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-2/+2
|\ \ | |/
| * Write estate errors on startup to the logOren Hurvitz2011-06-071-2/+2
| |
| * When asked to join region to existing estate, make first estate name the ↵Justin Clark-Casey (justincc)2011-04-011-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-011-1/+1
| | | | | | | | yes instead of no.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-271-38/+87
|\ \ | |/
| * On initial setup, include estate and regions names in questions to make it ↵Justin Clark-Casey (justincc)2011-03-211-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-211-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-211-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-211-12/+7
| | | | | | | | a local variable
| * On initial region registration, if the user chooses the option to make the ↵Justin Clark-Casey (justincc)2011-03-211-1/+12
| | | | | | | | region part of an existing estate, then list the existing region names.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-161-4/+8
|\ \ | |/
| * Fix bug where "My estate" name was always used even if the user entered a ↵Justin Clark-Casey (justincc)2011-02-121-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 '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-051-2/+2
| | |\
* | | | 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-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
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-23/+33
|\ \ | |/ | | | | | | 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.
| * * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-121-23/+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
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-031-2/+3
|\ \ | |/
| * reinsert functionality to debug log more levels of incoming and outgoing ↵Justin Clark-Casey (justincc)2010-08-311-1/+0
| | | | | | | | | | | | | | client protocol packets These levels correspond to packets that one isn't usually interested in when debugging (e.g. regular outgoing SimStats packets) This is equivalent to what we had a year ago before it was removed. It's extremely crude since it doesn't allow one to pick individual clients or packets. However, it can still be useful when debugging packet race conditions.
| * Report exception message as well as stack trace if a region fails to ↵Justin Clark-Casey (justincc)2010-08-301-1/+3
| | | | | | | | register with the grid service in grid mode
| * Add some maptile options, change maptile generation from OpenSimBase to SceneMelanie2010-08-201-8/+0
| | | | | | | | to make it more configurable.