Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into bigmerge | Melanie | 2011-11-01 | 2 | -3/+0 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| * | Removed see_into_this_sim_from_neighbor configuration option. | Dan Lake | 2011-11-01 | 1 | -3/+0 |
| | | |||||
| * | Remove unused PumaCode.SvnDotNet library | Justin Clark-Casey (justincc) | 2011-10-31 | 1 | -0/+0 |
| | | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-30 | 1 | -0/+4 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| * | Add missing max_listens_per_region to [LL_Functions] config section in ↵ | Justin Clark-Casey (justincc) | 2011-10-29 | 1 | -0/+4 |
| | | | | | | | | | | | | OpenSimDefaults.ini + explanation. This setting controls the maximum number of listeners in a region | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 2 | -0/+14 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | Added optional owner classes to existing OSSL agent Permissions | Michelle Argus | 2011-10-26 | 2 | -0/+14 |
| | | | | | | | | | | | | PARCEL_GROUP, PARCEL_OWNER, ESTATE_MANAGER and REGION_OWNER can be combined with the existing agent uuid option to limit ossl functions to agents and owner classes. Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
* | | Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+33 |
|\ \ | |/ | |||||
| * | Add new EventQueueTests with basic test to check that adding a client ↵ | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -0/+33 |
| | | | | | | | | registers an http poll | ||||
* | | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge | Melanie | 2011-10-25 | 2 | -0/+16 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | ||||
| * | Add optional getauthinfo and setauthinfo authentication service calls. | Justin Clark-Casey (justincc) | 2011-10-24 | 2 | -0/+16 |
| | | | | | | | | | | These are disabled by default, as before. Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default) These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey | ||||
* | | Merge commit '655aee44c4236d7023b9274645bf033b87b17131' into bigmerge | Melanie | 2011-10-25 | 1 | -23/+21 |
|\ \ | |/ | |||||
| * | Rename some of the example commented out server names to mygridserver.com ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -23/+21 |
| | | | | | | | | | | | | | | like all the others. This is to make it easier to change all these names at once, where all grids services are running from the same location. Also rearranges some lines in [Modules] so that StandaloneCommon.ini.example and GridCommon.ini.exmaple are consistent. | ||||
* | | 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 |
| | | | | | | | | | | OpenSim needs an asset cache. Running without one will cause problems. Thanks to Ai Austin for the suggestions in http://opensimulator.org/mantis/view.php?id=4850 | ||||
* | | Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmerge | Melanie | 2011-10-25 | 2 | -4/+12 |
|\ \ | |/ | |||||
| * | Add option to allow remote http calls to setpassword in the ↵ | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -4/+12 |
| | | | | | | | | | | | | | | AuthenticationService. This is switched on by setting AllowSetPassword = true in the [AuthenticationService] section of Robust.ini or Robust.HG.ini Default is false as before. | ||||
* | | Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmerge | Melanie | 2011-10-25 | 2 | -1/+8 |
|\ \ | |/ | |||||
| * | Allow an http call to set account details if AllowSetAccount = true in ↵ | Justin Clark-Casey (justincc) | 2011-10-19 | 2 | -1/+8 |
| | | | | | | | | | | | | [UserAccountService]. As before, default is false to not allow these calls. | ||||
* | | 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 ↵ | Justin Clark-Casey (justincc) | 2011-10-18 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | UserAccountService Default is false, as before. Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces. Only Ruths can be created at present. Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service. | ||||
* | | 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 |
| | | | | | | | | | | | | As discussed in http://lists.berlios.de/pipermail/opensim-dev/2011-October/010599.html and the preceeding thread mails, the aim of this setting is to avoid overloading the viewer UDP connection where the client is failing to ack packets. Please mantis any anomalous viewer connection behaviour which wasn't there before. | ||||
* | | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Restore [Startup] physical_prim flag which can stop any prims being subject ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | | to physics This had stopped working. However, at the moment it still allows the physics flag to be set even though this has no effect. This needs to be fixed. Default for this flag is true as previously. | ||||
* | | 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 ↵ | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -0/+1 |
| | | | | | | | | accidentally delete in 2fbc98f (Jul 7 2011) | ||||
* | | 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 |
| | | | | | | | | | | | | | | | | | | This exactly fits five ODE steps in the default frame time (0.089). This means that ODE execution time now matches the default minimum frame time. This eliminates errors between distance travelled as calculated by ODE in clear air and simple extrapolation. On the old values, ODE would actually do calculations over 0.1 seconds rather than 0.089. This means that once the avatar is at top speed, no additional packets need to be sent for smooth movement, since no error develops between server and viewer. This approach replaces the tweaks previously discussed on the opensim-dev mailing list | ||||
* | | Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+42 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Expose minimum frame time and update periods for experimentation. | Justin Clark-Casey (justincc) | 2011-10-13 | 1 | -0/+42 |
| | | | | | | | | | | | | | | Settings are at bottom of [Startup] in OpenSimDefaults.ini, override in OpenSim.ini to change Defaults are the same as previously. More information to come on opensim-dev shortly. Feel free to tweak but if you do please don't expect any support unless feedback on certain tweaks is explicitly requested. | ||||
* | | 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 |
| | | | | | | | | spam, so it should not load unless HG is desired. | ||||
* | | 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 |
| | | | | | | | | | | by default) the config default. This way it will work for current cases while allowing the use of other groups modules without config bloat. | ||||
* | | 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 |
| | | | | | | | | Default is currently on since this is the historical setting | ||||
* | | Merge commit '5551542c286c5db4fa47527c3167bcf539116ada' into bigmerge | Melanie | 2011-10-12 | 2 | -0/+2 |
|\ \ | |/ | |||||
| * | Improve explanation of access_ip_addresses in [RemoteAdmin] to say that ↵ | Justin Clark-Casey (justincc) | 2011-10-08 | 2 | -0/+2 |
| | | | | | | | | there are no restrictions if not set | ||||
* | | 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 |
| | | | | | | | | | | | | Also adds password check to some functions where this was missing and fixes some parameter checking. This is a patch from http://opensimulator.org/mantis/view.php?id=5715 with a few small unrelated spacing tweaks from me. Thanks Michelle Argus. | ||||
* | | Merge commit '5bc6503ae1295d00934a5f2ab92484ebcc8513a1' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Correct DeleteScriptsOnRestart to DeleteScriptsOnStartup in comments in ↵ | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 |
| | | | | | | | | OpenSim.ini.example | ||||
* | | 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 ↵ | Justin Clark-Casey (justincc) | 2011-09-30 | 2 | -19/+38 |
| | | | | | | | | | | | | OpenSim.ini.example I this is generally useful rather than a 'default' setting | ||||
* | | 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 |
| | |