aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-111-1/+1
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IEstateModule.cs
| * Correct max_listeners_per_region in OpenSimDefaults.ini to ↵Justin Clark-Casey (justincc)2012-04-101-1/+1
| | | | | | | | | | | | | | max_listens_per_region Value for this setting in OpenSimDefaults.ini (1000) is same as setting in code (1000) so this should have no effect Thanks to Ovi Chris Rouly for pointing this out.
* | Merge branch 'master' into careminsterMelanie2012-03-271-0/+12
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * User level based restrictions for HyperGrid teleports, asset uploads, group ↵Snoopy Pfeffer2012-03-271-0/+12
| | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
* | Merge branch 'master' into careminsterMelanie2012-03-271-1/+2
|\ \ | |/
| * BulletSim: update BulletSim binaries and configuration fixing a crash which ↵Robert Adams2012-03-261-1/+2
| | | | | | | | happens when there are more than a few hundred physical objects.
* | Merge branch 'master' into careminsterMelanie2012-03-261-1/+11
|\ \ | |/
| * BulletSim: change default of shouldDisableContactPoolDynamicAllocation from ↵Robert Adams2012-03-231-1/+1
| | | | | | | | False to True. It seems that collisions don't happen well when it is False (things fall through terrain).
| * BulletSim: add a bunch of internal Bullet configuration parameters to ↵Robert Adams2012-03-231-0/+9
| | | | | | | | OpenSimDefaults.ini and the code.
| * BulletSim: Add AvatarRestitution parameter. Centralize computation of ↵Robert Adams2012-03-231-1/+2
| | | | | | | | buoyancy for flying. Tweek avatar default friction and resititution
| * BulletSim: add some new runtime setable parameters to match the dll.Robert Adams2012-03-231-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-03-231-0/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Add information about SendPeriodicAppearanceUpdates to OpenSimDefaults.ini ↵Justin Clark-Casey (justincc)2012-03-231-0/+5
| | | | | | | | | | | | for now. Default remains false.
* | Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminsterMelanie2012-03-221-0/+8
|\ \ | |/
| * Added new simple_build_permissions config to the .ini and .example files.Diva Canto2012-03-221-0/+8
| |
| * Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY ↵Melanie2012-03-221-7/+0
| | | | | | | | | | | | DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch." This reverts commit 6146e7ef258b10888ad7464b72b75cca701e02c9.
| * Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. ↵Diva Canto2012-03-221-0/+7
| | | | | | | | Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch.
* | Merge branch 'master' into careminsterMelanie2012-03-181-0/+3
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Terrain: added [Terrain] section with an option to load an initial flat ↵Diva Canto2012-03-161-0/+3
| | | | | | | | terrain. Default is still pinhead island. I much rather have a flat land in the beginning.
* | Merge branch 'master' into careminsterMelanie2012-02-151-1/+5
|\ \ | |/
| * Fix: Lightshare Module(Windlight)-Region settings are not applicable for ↵PixelTomsen2012-02-141-1/+0
| | | | | | | | database sqlite mantis: http://opensimulator.org/mantis/view.php?id=5888
| * Clamp ODE character velocity. Make ODE falling character 54m/s by default.Justin Clark-Casey (justincc)2012-02-111-0/+5
| | | | | | | | | | | | | | If velocity reaches 256 in any vector then bad things happen with ODE, so we now clamp this value. In addition, a falling avatar is clamped by default at 54 m/s, which is the same as a falling skydiver. This also appears to be the value used on the linden lab grid. This should resolve http://opensimulator.org/mantis/view.php?id=5882
* | Merge branch 'master' into careminsterMelanie2012-02-071-4/+3
|\ \ | |/
| * Set UseMeshiesPhysicsMesh = true in [Mesh] by defaultJustin Clark-Casey (justincc)2012-02-071-4/+3
| | | | | | | | This means that uploaded meshes will get a physics (collision) mesh if uploaded with that option via a viewer.
* | Merge branch 'master' into careminsterMelanie2012-02-051-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * change NonPhysicalPrimMax to NonphysicalPrimMax to make this variablenebadon2012-02-041-1/+1
| | | | | | | | | | work correctly, it was being ignored because of the case, this effects OpenSim.ini.example and OpenSimDefaults.ini
* | Merge branch 'master' into careminsterMelanie2012-01-291-1/+1
|\ \ | |/
| * Fix:Get embedded objects in notecard ↵PixelTomsen2012-01-291-1/+1
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=2607 Signed-off-by: nebadon <michael@osgrid.org>
* | Merge branch 'master' into careminsterMelanie2012-01-261-2/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Update BulletSim.dll with some interface changes and tuning (see ↵Robert Adams2012-01-251-2/+3
| | | | | | | | opensim-libs). Change BSScene to use new interface.
* | Merge branch 'master' into careminsterMelanie2012-01-061-11/+12
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
| * eliminate a few tabs from OpenSimDefaults.iniJustin Clark-Casey (justincc)2012-01-061-10/+10
| |
| * Add disabled Cap_FetchInventory2 = "" reference to [ClientStack.LindenCaps] ↵Justin Clark-Casey (justincc)2012-01-061-3/+4
| | | | | | | | in line with all the other ones that are there
* | Merge branch 'master' into careminsterMelanie2011-12-221-0/+5
|\ \ | |/
| * Make it possible to force all prims to be phantom via the collidable_prim ↵Justin Clark-Casey (justincc)2011-12-221-0/+5
| | | | | | | | | | | | | | | | | | boolean setting in the OpenSim.ini config [Startup] section. Naturally, default is true. When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom. This setting is for test purposes. This switch does not affect the collision of avatars with the terrain.
* | Set adaptive throttles false by default because it doesn't play nice with AVNMelanie2011-12-091-1/+1
| | | | | | | | code
* | 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-191-24/+30
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * 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-171-6/+9
| | | | | | | | This only provides enough functionality to allow operations for no money (e.g. sell for $0).
* | Merge branch 'master' into bigmergeMelanie2011-11-101-0/+7
|\ \ | |/
| * Alter commit 3758306 to allow region name to be substituted within a region ↵Justin Clark-Casey (justincc)2011-11-101-0/+7
| | | | | | | | | | | | | | | | 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-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-041-2/+2
|\ \ | |/ | | | | | | | | | | | | 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-021-2/+2
| | | | | | | | | | | | 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-011-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
| |
generated by cgit v1.1 at 2024-12-25 11:59:52 +0000