aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-281-1/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * BulletSim: refactor all the linkset logic out of the prim classRobert Adams2012-07-261-2/+2
| | | | | | | | | | | | and into its own class. The BulletSim data structures track individual prims as linksets of 1 so most of the prim code is not different between a linked and unlinked object.
| * BulletSim: add parameters for setting linkset constraint factorsRobert Adams2012-07-251-0/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-06-211-1/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Implement max_external_urls_per_simulator setting in [LL-Functions] to allow ↵Justin Clark-Casey (justincc)2012-06-161-1/+3
| | | | | | | | | | | | | | configuration of how many urls can be set up by llRequestURL() Defaults remains as 100. This setting is per simulator instead of per region due to how the url script module is structured.
* | Merge branch 'master' into careminsterMelanie2012-06-141-0/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add the updated OpenSimDefaults.ini for the prior timer_Interval patch.BlueWall2012-06-121-0/+4
| |
* | Merge branch 'master' into careminsterMelanie2012-06-091-0/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * Add documentation to AllowGodFunctions setting in [LL-Functions]Justin Clark-Casey (justincc)2012-06-091-0/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-06-061-0/+13
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * Mantis 4597 AgentPaused packet is ignored.Talun2012-06-051-0/+13
| | | | | | | | | | | | The packet was actually being handled but not acted on. This change extends the default timeout for paused clients to 5 minutes and makes both the paused and non-paused timeout periods configurable.
* | Merge branch 'master' into careminsterMelanie2012-05-311-11/+19
|\ \ | |/
| * Add an optional mechanism for physics modules to collect and return ↵Justin Clark-Casey (justincc)2012-05-311-11/+19
| | | | | | | | | | | | | | | | | | | | | | arbitrary stats. If active, the physics module can return arbitrary stat counters that can be seen via the MonitoringModule (http://opensimulator.org/wiki/Monitoring_Module) This is only active in OdeScene if collect_stats = true in [ODEPhysicsSettings]. This patch allows OdeScene to collect elapsed time information for calls to the ODE native collision methods to assess what proportion of time this takes compared to total physics processing. This data is returned as ODENativeCollisionFrameMS in the monitoring module, updated every 3 seconds. The performance effect of collecting stats is probably extremely minor, dwarfed by the rest of the physics code.
* | Merge branch 'master' into careminsterMelanie2012-05-271-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Environment Module - allows Environment settings for Viewer3 warning: ↵PixelTomsen2012-05-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | includes database region store migrations for mssql, mysql, sqlite enable/disable this module: Cap_EnvironmentSettings = "localhost" (for enable) Cap_EnvironmentSettings = "" (for disable) at ClientStack.LindenCaps section (OpenSimDefaults.ini file) or owerwrite in OpenSim.ini mantis: http://opensimulator.org/mantis/view.php?id=5860 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-05-191-5/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| * Enable FetchInventoryDescendents2 and FetchInventory2 caps by default. This ↵Justin Clark-Casey (justincc)2012-05-191-5/+4
| | | | | | | | | | | | | | appears to be required now for LL 3.3.1 to work properly. Without this, LL 3.3.1 continually pushes LLInventoryModelFetchDescendentsResponder::error 499 to its log. This cap will be ignored by older viewers - UDP inventory will work normally.
* | Merge branch 'master' into careminsterMelanie2012-04-271-0/+7
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Add a configuration switch to turn on/off the use of the trashMic Bowman2012-04-251-0/+7
| | | | | | | | | | | | | | | | | | folder when deleting objects from a scene. The use of the trash folder causes assets to be created and stored everytime you delete an object from the scene (slows down the delete and adds mostly useless assets to your database). Default is on (use the trash folder) which is the standard behavior.
* | Merge branch 'master' into careminsterMelanie2012-04-181-0/+6
|\ \ | |/
| * add configuration for jsonstore module, disabled by defaultMic Bowman2012-04-171-0/+6
| |
* | 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
generated by cgit v1.1 at 2024-12-28 01:08:36 +0000