| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into bigmerge | Melanie | 2011-11-01 | 1 | -0/+13 |
|\ |
|
| * | Removed unused show commands from Scene.cs and SceneBase.cs. The show modules... | Dan Lake | 2011-10-31 | 1 | -0/+13 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o... | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+1 |
* | | Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+8 |
|\ \
| |/ |
|
| * | Allow an avatar to be explicitly named to the "debug packet" command | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -4/+8 |
* | | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge | Melanie | 2011-10-25 | 2 | -4/+1 |
|\ \
| |/ |
|
| * | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t... | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -4/+1 |
* | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 2 | -2/+1 |
|\ \
| |/ |
|
| * | fetch physical_prim switch from [Startup] config from inside scene, as is don... | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -2/+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 '8caf3ed49ec3403843e25db018cc9db63e2ca643' into bigmerge | Melanie | 2011-10-11 | 1 | -9/+0 |
|\ \
| |/ |
|
| * | Remove the unimplented "clear assets" command. | Justin Clark-Casey (justincc) | 2011-09-24 | 1 | -9/+0 |
* | | 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 | 2 | -4/+8 |
|\ \
| |/ |
|
| * | When creating an OAR, optionally exclude objects according to their permissions | Oren Hurvitz | 2011-09-12 | 1 | -4/+6 |
| * | Delay loading scripts until the scene has finished loading | Oren Hurvitz | 2011-09-09 | 1 | -0/+2 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 2 | -1/+21 |
|\ \
| |/ |
|
| * | prevent "create region" console command from being able to create a region wi... | Justin Clark-Casey (justincc) | 2011-08-06 | 1 | -1/+15 |
| * | Temporarily put in a log line which shows which locale the user is running in. | Justin Clark-Casey (justincc) | 2011-07-29 | 2 | -0/+6 |
* | | 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 | root | 2011-07-05 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Make default serverside_object_permissions = true since this better matches u... | Justin Clark-Casey (justincc) | 2011-07-01 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 2 | -2/+6 |
|\ \
| |/ |
|
| * | Write estate errors on startup to the log | Oren Hurvitz | 2011-06-07 | 1 | -2/+2 |
| * | Adding boolean alias for commandline switches like -save_crashes=yes | Makopoppo | 2011-06-01 | 1 | -0/+2 |
| * | Fix: The command line switches 'save_crashes' and 'crash_dir' haven't actuall... | Makopoppo | 2011-06-01 | 1 | -0/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-27 | 1 | -4/+5 |
|\ \
| |/ |
|
| * | Add a --noassets option to "save oar". | Justin Clark-Casey (justincc) | 2011-05-26 | 1 | -4/+5 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-08 | 1 | -15/+1 |
|\ \
| |/ |
|
| * | remove obsolete [StandAlone] config section parsing, none of which was actual... | Justin Clark-Casey (justincc) | 2011-05-06 | 1 | -15/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-12 | 1 | -5/+13 |
|\ \
| |/ |
|
| * | create "config show" as a region console command synonym for "config get". | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -5/+13 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-08 | 1 | -11/+3 |
|\ \
| |/ |
|
| * | trivial whitespace removal to trigger a panda rebuild | Justin Clark-Casey (justincc) | 2011-04-08 | 1 | -11/+3 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-03 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Comment out some startup logging lines to make up for the one I added earlier... | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -1/+1 |
| * | When asked to join region to existing estate, make first estate name the defa... | Justin Clark-Casey (justincc) | 2011-04-01 | 1 | -5/+2 |