| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -1/+1 |
| | | | | | | | | | the others | ||||
| * | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | fetch physical_prim switch from [Startup] config from inside scene, as is ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -1/+1 |
| | | | | | | | | | done for most other scene config params | ||||
| * | | 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 '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 | 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 |
| | | | | | | | | | 5 seconds. | ||||
| * | | 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 ↵ | 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 'careminster-presence-refactor' of ↵ | Melanie | 2010-12-07 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * \ | 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 |
| |/ / / | | | | | | | | | | Prevents empty instances from hanging around when Mono.Addins messes up | ||||
| * | | | 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 ↵ | Justin Clark-Casey (justincc) | 2010-12-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | to make the association clear | ||||
| * | | | 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 |
| | |/ | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| | * | * 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 |
| |\ \ | |/ | | | | | | | 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 IEstateDataService | John Hurliman | 2010-09-12 | 1 | -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 | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |