| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | fetch physical_prim switch from [Startup] config from inside scene, as is don... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -1/+1 |
* | | 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 ret... | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -3/+3 |
* | | 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 with... | Justin Clark-Casey (justincc) | 2011-10-05 | 1 | -1/+1 |
* | | 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 UU... | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+10 |
* | | 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 |
|\ \
| |/ |
|
| * | Correctly create a freshly created estate owner's default items and avatar en... | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -0/+50 |
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -0/+2 |
|\ \
| |/ |
|
| * | Delay loading scripts until the scene has finished loading | Oren Hurvitz | 2011-09-09 | 1 | -0/+2 |
* | | Add a timer to monitor the heartbeat. Restart it if it's been dead for | Melanie | 2011-07-25 | 1 | -0/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | Write estate errors on startup to the log | Oren Hurvitz | 2011-06-07 | 1 | -2/+2 |
| * | When asked to join region to existing estate, make first estate name the defa... | Justin Clark-Casey (justincc) | 2011-04-01 | 1 | -5/+2 |
| * | Make default answer for 'do you wish to join region to an existing estate' ye... | Justin Clark-Casey (justincc) | 2011-04-01 | 1 | -1/+1 |
* | | 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 cl... | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -4/+6 |
| * | In initial setup, stop a user being able to create a new estate with the same... | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -14/+31 |
| * | On initial opensim setup, don't ask the user whether they want to join an exi... | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -39/+63 |
| * | refactor: use EstateDataService property directly instead of loading it into ... | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -12/+7 |
| * | On initial region registration, if the user chooses the option to make the re... | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -1/+12 |
* | | 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 dif... | Justin Clark-Casey (justincc) | 2011-02-12 | 1 | -4/+8 |
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Melanie | 2010-12-07 | 1 | -1/+1 |
|\ \ |
|
| * \ | 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 | 1 | -2/+2 |
| | |\ |
|
* | | | | Cowardly refuse to keep running when no application plugins are loaded. | Melanie | 2010-12-07 | 1 | -0/+6 |
|/ / / |
|
* | | | 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 to... | Justin Clark-Casey (justincc) | 2010-12-03 | 1 | -2/+2 |
* | | | 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 |
| |/ |
|
| * | * 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 |
| |/ |
|
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -23/+33 |
|\ \
| |/ |
|
| * | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 1 | -23/+33 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-03 | 1 | -2/+3 |
|\ \
| |/ |
|
| * | reinsert functionality to debug log more levels of incoming and outgoing clie... | Justin Clark-Casey (justincc) | 2010-08-31 | 1 | -1/+0 |