| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge | Melanie | 2011-10-25 | 2 | -0/+16 |
|\ \
| |/ |
|
| * | Add optional getauthinfo and setauthinfo authentication service calls. | Justin Clark-Casey (justincc) | 2011-10-24 | 2 | -0/+16 |
* | | Merge commit '655aee44c4236d7023b9274645bf033b87b17131' into bigmerge | Melanie | 2011-10-25 | 1 | -23/+21 |
|\ \
| |/ |
|
| * | Rename some of the example commented out server names to mygridserver.com lik... | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -23/+21 |
* | | Merge commit '229ca09b7956f51fc2618dc35dff87cf04bf0fc9' into bigmerge | Melanie | 2011-10-25 | 2 | -17/+19 |
|\ \
| |/ |
|
| * | Make config comments about choosing assetcache modules clearer. | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -17/+19 |
* | | Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmerge | Melanie | 2011-10-25 | 2 | -4/+12 |
|\ \
| |/ |
|
| * | Add option to allow remote http calls to setpassword in the AuthenticationSer... | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -4/+12 |
* | | Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmerge | Melanie | 2011-10-25 | 2 | -1/+8 |
|\ \
| |/ |
|
| * | Allow an http call to set account details if AllowSetAccount = true in [UserA... | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -1/+8 |
* | | Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge | Melanie | 2011-10-25 | 2 | -3/+10 |
|\ \
| |/ |
|
| * | Provide an option to allow remote calls to the CreateUser method on the UserA... | Justin Clark-Casey (justincc) | 2011-10-18 | 2 | -3/+10 |
* | | Merge commit '352002fd0b74a87f62ea82c76969e4110ba2542f' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Set enable_adaptive_throttles = true in OpenSimDefaults.ini | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -1/+1 |
* | | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+2 |
|\ \
| |/ |
|
| * | Restore [Startup] physical_prim flag which can stop any prims being subject t... | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -1/+2 |
* | | Merge commit 'bea65b06a445c267ecb77be08452146cb7fee1ce' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Add back the missing bin/addon-modules directory that I somehow managed to ac... | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -0/+1 |
* | | Merge commit '03102864f0d9851b6937ca5472f48f10ec861a26' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | change default ODE world_stepsize to 0.0178 from 0.02 | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -2/+2 |
* | | Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+42 |
|\ \
| |/ |
|
| * | Expose minimum frame time and update periods for experimentation. | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -0/+42 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 3 | -0/+3 |
|\ \
| |/ |
|
| * | Make it possible to disable the HG linker. On non-HG systems it spits yellow | Melanie | 2011-10-12 | 3 | -0/+3 |
* | | Disable Flotsam groups messaging module in our config base | Melanie | 2011-10-12 | 1 | -1/+1 |
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Update OpenSimDefaults.ini to make the prior state (Groups messaging enabled | Melanie | 2011-10-12 | 1 | -1/+1 |
* | | Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+5 |
|\ \
| |/ |
|
| * | Provide a way to turn the MonitorModule on and off | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -0/+5 |
* | | Merge commit '5551542c286c5db4fa47527c3167bcf539116ada' into bigmerge | Melanie | 2011-10-12 | 2 | -0/+2 |
|\ \
| |/ |
|
| * | Improve explanation of access_ip_addresses in [RemoteAdmin] to say that there... | Justin Clark-Casey (justincc) | 2011-10-08 | 2 | -0/+2 |
* | | Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge | Melanie | 2011-10-12 | 2 | -0/+8 |
|\ \
| |/ |
|
| * | Add option to allow only explicitly listed IPs to access RemoteAdmin facilities. | Justin Clark-Casey (justincc) | 2011-10-08 | 2 | -0/+8 |
* | | Merge commit '5bc6503ae1295d00934a5f2ab92484ebcc8513a1' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Correct DeleteScriptsOnRestart to DeleteScriptsOnStartup in comments in OpenS... | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 |
* | | Merge commit 'f1986d54bb3569e6b075b2125e860f31842a60cc' into bigmerge | Melanie | 2011-10-12 | 2 | -9/+8 |
|\ \
| |/ |
|
| * | Clarify explanation of DeleteScriptsOnStartup switch in [XEngine]. | Justin Clark-Casey (justincc) | 2011-10-04 | 2 | -9/+8 |
* | | Merge commit '844b4f3a168a5fb1c19902e1f230f24d677c152f' into bigmerge | Melanie | 2011-10-11 | 2 | -19/+38 |
|\ \
| |/ |
|
| * | copy config information on allow/disallow individual os functions into OpenSi... | Justin Clark-Casey (justincc) | 2011-09-30 | 2 | -19/+38 |
* | | Merge commit '6d0978594d1eca9ae56584afe38215f4262256e7' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+0 |
|\ \
| |/ |
|
| * | remove unused postgresql dll | Justin Clark-Casey (justincc) | 2011-09-30 | 1 | -0/+0 |
* | | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+8 |
|\ \
| |/ |
|
| * | Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to all... | Justin Clark-Casey (justincc) | 2011-09-30 | 1 | -0/+8 |
* | | Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge | Melanie | 2011-10-11 | 2 | -0/+9 |
|\ \
| |/ |
|
| * | Added a setting to [Startup] section of config that will allow the simulator ... | Kevin Houlihan & Michelle Argus | 2011-09-24 | 2 | -0/+9 |
* | | Merge commit '53646070057c9355bba6df9e181253232d97d8e9' into bigmerge | Melanie | 2011-10-11 | 2 | -5/+13 |
|\ \
| |/ |
|
| * | Clarify explanation of the "DeleteScriptsOnStartup" config switch and add thi... | Justin Clark-Casey (justincc) | 2011-09-24 | 2 | -5/+13 |
* | | Merge commit 'ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Correct asset id of library default iris texture. | Justin Clark-Casey (justincc) | 2011-09-23 | 1 | -1/+1 |
* | | Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+2 |
|\ \
| |/ |
|