aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-311-0/+11
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Make ReuseDynamicTextures an experimental config setting in [Textures]. ↵Justin Clark-Casey (justincc)2012-08-301-0/+11
| | | | | | | | | | | | | | | | | | | | Default is false, as before. If true, this setting reuses dynamically generated textures (i.e. created through osSetDynamicTextureData() and similar OSSL functions) where possible rather than always regenerating them. This results in much quicker updates viewer-side but may bloat the asset cache (though this is fixable). Also, sometimes issue have been seen where dynamic textures do not transfer to the viewer properly (permanently blurry). If this happens and that flag is set then they are not regenerated, the viewer has to clear cache or wait for 24 hours before all cached uuids are invalidated. CUrrently experimental. Default is false, as before.
* | Merge branch 'master' into careminsterMelanie2012-08-181-0/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * BulletSim: add parameters and functionality to specify the meshRobert Adams2012-08-171-0/+3
| | | | | | | | | | | | level of detail for large meshes. Remove parameter and code for DetailLog (conditional logging into regular log file).
* | Merge branch 'master' into careminsterMelanie2012-08-161-12/+17
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * BulletSim: add physics logging parameters to OpenSimDefaults.ini. Remove ↵Robert Adams2012-08-151-12/+17
| | | | | | | | trailing semis from some the of the value definitions.
* | Merge branch 'master' into careminsterMelanie2012-08-111-1/+1
|\ \ | |/
| * BulletSim: add avatar code to keep avatars from ending up trapped under the ↵Robert Adams2012-08-081-1/+1
| | | | | | | | terrain
* | Merge branch 'master' into careminsterMelanie2012-08-041-20/+22
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and ↵Justin Clark-Casey (justincc)2012-08-031-19/+14
| | | | | | | | | | | | DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket. All these settings are in OpenSimDefaults.ini only. If you are using them then please adjust your OpenSim.ini
| * Move previously unadvertised SendPeriodicAppearanceUpdates setting from ↵Justin Clark-Casey (justincc)2012-08-031-1/+8
| | | | | | | | | | | | | | | | | | | | [Startup] to [Appearance] config section. Add description and default of false (as before) to OpenSimDefaults.ini If set to true, this config switch will resend avatar appearance information (a small amount of UUID data, not the baked textures themselves) to other avatars in the sim every 60 seconds. For me, this has helped with situations where avatars appear persistently grey - the LL viewer sometimes did not appear to request assets the first time the appearance data was sent. However, this switch will not help with other appearance failure situations (e.g. failure to bake assets). This setting is experimental but will not have any significant impact on the simulator if turned to true.
* | Merge branch 'master' into careminsterMelanie2012-08-031-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * BulletSim: Debugging log statements added. Reduced size of updata buffer ↵Robert Adams2012-08-021-1/+1
| | | | | | | | trying to find a corrupted memory problem. Update DLL and SO.
* | 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.