aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmergeMelanie2011-10-251-1/+1
|\
| * move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t...Justin Clark-Casey (justincc)2011-10-151-1/+1
* | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * fetch physical_prim switch from [Startup] config from inside scene, as is don...Justin Clark-Casey (justincc)2011-10-151-1/+1
* | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmergeMelanie2011-10-121-3/+3
|\ \ | |/
| * remove the pointless slashes on the end of the (5!) different server stat ret...Justin Clark-Casey (justincc)2011-10-071-3/+3
* | Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmergeMelanie2011-10-121-1/+1
|\ \ | |/
| * Add user ID to new estate user prompt, to make it clearer and consistent with...Justin Clark-Casey (justincc)2011-10-051-1/+1
* | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmergeMelanie2011-10-121-1/+10
|\ \ | |/
| * When creating a new user on the comand line, give the option of allowing a UU...Justin Clark-Casey (justincc)2011-10-041-1/+10
* | 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
|\ \ | |/
| * Correctly create a freshly created estate owner's default items and avatar en...Justin Clark-Casey (justincc)2011-09-161-0/+50
* | 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
* | 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 defa...Justin Clark-Casey (justincc)2011-04-011-5/+2
| * Make default answer for 'do you wish to join region to an existing estate' ye...Justin Clark-Casey (justincc)2011-04-011-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-271-38/+87
|\ \ | |/
| * On initial setup, include estate and regions names in questions to make it cl...Justin Clark-Casey (justincc)2011-03-211-4/+6
| * In initial setup, stop a user being able to create a new estate with the same...Justin Clark-Casey (justincc)2011-03-211-14/+31
| * On initial opensim setup, don't ask the user whether they want to join an exi...Justin Clark-Casey (justincc)2011-03-211-39/+63
| * refactor: use EstateDataService property directly instead of loading it into ...Justin Clark-Casey (justincc)2011-03-211-12/+7
| * On initial region registration, if the user chooses the option to make the re...Justin Clark-Casey (justincc)2011-03-211-1/+12
* | 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 dif...Justin Clark-Casey (justincc)2011-02-121-4/+8
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2010-12-071-1/+1
|\ \
| * \ 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
|/ / /
* | | 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 to...Justin Clark-Casey (justincc)2010-12-031-2/+2
* | | 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
| |/
| * * 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
|\ \ | |/
| * * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-121-23/+33