aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-12-051-1/+1
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * change misleading login = http://127.0.0.1:9000/ in GridInfoService in ↵Justin Clark-Casey (justincc)2011-12-031-1/+1
| | | | | | | | Robust.ini.example to 8002
* | Merge branch 'master' into bigmergeMelanie2011-11-281-7/+10
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Implement the FetchInventoryDescendents2 capability using the same code as ↵Justin Clark-Casey (justincc)2011-11-251-4/+7
| | | | | | | | | | | | WebFetchInventoryDescendents. Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-11-251-3/+3
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-242-7/+7
|\ \ | |/
| * Shell Environment Variables in configBlueWall2011-11-231-0/+0
| | | | | | | | | | | | Adding updated Nini and support to use shell environment variables in OpenSimulator configuration. Nini @ https://github.com/BlueWall/Nini-Dev
| * Move DeleteScriptsOnStartup switch from [Startup] to [XEngine] in ↵Justin Clark-Casey (justincc)2011-11-211-7/+7
| | | | | | | | | | | | OpenSim.ini.example. If anybody was changing this and wondering why there was no effect, this is why.
* | Merge branch 'master' into bigmergeMelanie2011-11-197-5491/+5492
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Enable v2/v3 map tile url setting on robust as default in configJustin Clark-Casey (justincc)2011-11-192-2/+2
| | | | | | | | This is necessary to see map tiles on v2/v3 viewers and appears to work fine
| * Replace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied.justincc2011-11-183-5456/+5453
| | | | | | | | | | | | This will hopefully address mantis 5471, 5694 and 5718. This code is now in opensim-libs, along with Diva's slightly older patches (which were already applied to the DLLs in the opensim tree). Thanks Oren!
| * Turn the [RegionReady] module on by default and login_disable = true while ↵Justin Clark-Casey (justincc)2011-11-181-18/+21
| | | | | | | | | | | | | | | | scripts are loading. From field experience, we know that simulators can be unstable if a user logs in before the scripts have finished loading. This commit turns login_disable = true in [RegionReady] on by default which prevents this from happening. If you want the old behaviour, please copy these section from OpenSimDefaults.ini into OpenSim.ini and set login_disable = false
| * Turn SellEnabled in the [EconomyModule] on by default.Justin Clark-Casey (justincc)2011-11-172-15/+16
| | | | | | | | This only provides enough functionality to allow operations for no money (e.g. sell for $0).
* | Merge branch 'master' into bigmergeMelanie2011-11-102-6/+15
|\ \ | |/
| * Alter commit 3758306 to allow region name to be substituted within a region ↵Justin Clark-Casey (justincc)2011-11-102-6/+15
| | | | | | | | | | | | | | | | console prompt This is to allow broader subsitution in the future. Currently, the only substitions are \R (for region name) and \\ (for a single backslash) e.g. "Region (\R) " is the current and continuing default prompt This renames custom_prompt in [Startup] to ConsolePrompt
* | Merge branch 'master' into bigmergeMelanie2011-11-101-0/+5
|\ \ | |/
| * Allow custom setting for the console promptGuduleLapointe2011-11-101-0/+5
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into bigmergeMelanie2011-11-051-4/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Remove enableprejump config option and associated code as this is nowMelanie2011-11-051-4/+0
| | | | | | | | fully functional and cannot be disabled because that would break timings.
* | Merge branch 'master' into bigmergeMelanie2011-11-042-4/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
| * Change default say distance to 20m from 30m, the same as on the big grid. ↵Justin Clark-Casey (justincc)2011-11-022-4/+4
| | | | | | | | | | | | This is to improve the migration of scripts that expect a 20m say distance. If you want to keep a 30m say distance then please set this as the say_distance parameter in the [Chat] section of OpenSim.ini.
* | Merge branch 'master' into bigmergeMelanie2011-11-012-3/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Removed see_into_this_sim_from_neighbor configuration option.Dan Lake2011-11-011-3/+0
| |
| * Remove unused PumaCode.SvnDotNet libraryJustin Clark-Casey (justincc)2011-10-311-0/+0
| |
* | Merge branch 'master' into bigmergeMelanie2011-10-301-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-291-0/+4
| | | | | | | | | | | | OpenSimDefaults.ini + explanation. This setting controls the maximum number of listeners in a region
* | Merge branch 'master' into bigmergeMelanie2011-10-262-0/+14
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Added optional owner classes to existing OSSL agent PermissionsMichelle Argus2011-10-262-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 bigmergeMelanie2011-10-251-0/+33
|\ \ | |/
| * Add new EventQueueTests with basic test to check that adding a client ↵Justin Clark-Casey (justincc)2011-10-241-0/+33
| | | | | | | | registers an http poll
* | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmergeMelanie2011-10-252-0/+16
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
| * Add optional getauthinfo and setauthinfo authentication service calls.Justin Clark-Casey (justincc)2011-10-242-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 bigmergeMelanie2011-10-251-23/+21
|\ \ | |/
| * Rename some of the example commented out server names to mygridserver.com ↵Justin Clark-Casey (justincc)2011-10-221-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 bigmergeMelanie2011-10-252-17/+19
|\ \ | |/
| * Make config comments about choosing assetcache modules clearer.Justin Clark-Casey (justincc)2011-10-222-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 bigmergeMelanie2011-10-252-4/+12
|\ \ | |/
| * Add option to allow remote http calls to setpassword in the ↵Justin Clark-Casey (justincc)2011-10-192-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 bigmergeMelanie2011-10-252-1/+8
|\ \ | |/
| * Allow an http call to set account details if AllowSetAccount = true in ↵Justin Clark-Casey (justincc)2011-10-192-1/+8
| | | | | | | | | | | | [UserAccountService]. As before, default is false to not allow these calls.
* | Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmergeMelanie2011-10-252-3/+10
|\ \ | |/
| * Provide an option to allow remote calls to the CreateUser method on the ↵Justin Clark-Casey (justincc)2011-10-182-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 bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * Set enable_adaptive_throttles = true in OpenSimDefaults.iniJustin Clark-Casey (justincc)2011-10-171-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 bigmergeMelanie2011-10-251-1/+2
|\ \ | |/
| * Restore [Startup] physical_prim flag which can stop any prims being subject ↵Justin Clark-Casey (justincc)2011-10-151-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 bigmergeMelanie2011-10-251-0/+1
|\ \ | |/
| * Add back the missing bin/addon-modules directory that I somehow managed to ↵Justin Clark-Casey (justincc)2011-10-141-0/+1
| | | | | | | | accidentally delete in 2fbc98f (Jul 7 2011)
* | Merge commit '03102864f0d9851b6937ca5472f48f10ec861a26' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * change default ODE world_stepsize to 0.0178 from 0.02Justin Clark-Casey (justincc)2011-10-141-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
generated by cgit v1.1 at 2024-12-26 18:13:42 +0000