 Melanie
|
f1fa059b37
Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge
|
13 years ago |
|
Melanie
|
986a3838a6
Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmerge
|
13 years ago |
|
Melanie
|
5b40389352
Merge commit '4ae4b14b5da9b828bbb7c4e5b05693ad8528556a' into bigmerge
|
13 years ago |
|
Melanie
|
8fac7c0650
Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge
|
13 years ago |
 Justin Clark-Casey (justincc)
|
1f78dc6504
remove the pointless slashes on the end of the (5!) different server stat retrieval mechanisms.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
8a8983b3d4
Add user ID to new estate user prompt, to make it clearer and consistent with the main create user prompts
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
b907a66f39
When creating a new user on the comand line, give the option of allowing a UUID to be specified to override the randomly generated one.
|
13 years ago |
|
justincc
|
a00327d0e5
Fix build errors on Windows by adding missing OpenSim.Services.Base reference
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
9046651583
Pass any region scope through to the CreateUser() method
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
4ae4b14b5d
refactor: move estate owner setup code into separate method
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
522d6261f1
Correctly create a freshly created estate owner's default items and avatar entries on standalone if applicable.
|
13 years ago |
 Tom
|
5484c9b585
Bring us up to date.
|
13 years ago |
 Oren Hurvitz
|
1dd904b78e
Delay loading scripts until the scene has finished loading
|
13 years ago |
|
Melanie
|
5c012cac54
Add a timer to monitor the heartbeat. Restart it if it's been dead for
|
13 years ago |
|
Melanie
|
326c46ba70
Merge branch 'master' into careminster-presence-refactor
|
13 years ago |
|
Oren Hurvitz
|
61f1c2b2c5
Write estate errors on startup to the log
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
8f4bf43534
When asked to join region to existing estate, make first estate name the default instead of None
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
e1ceb461c0
Make default answer for 'do you wish to join region to an existing estate' yes instead of no.
|
13 years ago |
|
Melanie
|
a62b435a39
Merge branch 'master' into careminster-presence-refactor
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
7acade00b9
On initial setup, include estate and regions names in questions to make it clearer what they relate to.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
3382de4d8b
In initial setup, stop a user being able to create a new estate with the same name as an existing estate.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
060a53b896
On initial opensim setup, don't ask the user whether they want to join an existing opensim estate when there aren't any. Proceed directly to estate setup instead.
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
ee7cfc2854
refactor: use EstateDataService property directly instead of loading it into a local variable
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
d3a20a1e92
On initial region registration, if the user chooses the option to make the region part of an existing estate, then list the existing region names.
|
13 years ago |
|
Melanie
|
ccd6e5d071
Merge branch 'master' into careminster-presence-refactor
|
13 years ago |
|
Justin Clark-Casey (justincc)
|
03d82a5a85
Fix bug where "My estate" name was always used even if the user entered a different name on initial setup.
|
13 years ago |
|
Melanie
|
b325721d6f
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
|
14 years ago |
|
Melanie
|
b960a05e67
Cowardly refuse to keep running when no application plugins are loaded.
|
14 years ago |
|
Melanie
|
45314c6622
Merge branch 'master' into careminster-presence-refactor
|
14 years ago |
 Jonathan Freedman
|
45cd2e3ef9
Merge branch 'master-core' into mantis5110
|
14 years ago |
