aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-12-301-2/+2
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * BulletSim: update values in OpenSimDefaults.ini to reflect the values really ↵Robert Adams2012-12-281-2/+2
| | | | | | | | used by the code.
* | Merge branch 'master' into careminsterMelanie2012-12-161-0/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Add WaitForEventCompletionOnScriptStop [XEngine] config param to ↵Justin Clark-Casey (justincc)2012-12-131-0/+4
| | | | | | | | | | | | | | OpenSimDefaults.ini to allow change of the wait time for an event to complete on script removal before aborting its thread Default is 1000, as has previously been the case. This parameter exists for further debug work concerning mono 2.10 crashes that may be related to locks not being removed on Thread.Abort
* | Merge branch 'master' into careminsterMelanie2012-11-301-21/+12
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * BulletSim: update OpenSimDefaults.ini with current default values for ↵Robert Adams2012-11-251-21/+12
| | | | | | | | friction and collision margin. Remove some of the BulletSim parameters that are very esoteric and dangerous. Most of the remaining parameters are features one can 'see'.
* | Merge branch 'master' into careminsterMelanie2012-11-251-2/+7
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Enable further client stack packet pooling by default by setting ↵Justin Clark-Casey (justincc)2012-11-231-2/+1
| | | | | | | | | | | | | | | | | | | | RecycleBaseUDPPackets = true by default. This reduces base memory churn of every client connection, improving the garbage collection situation. The effect is a significant portion of base load (an avatar standing still on a completely blank island) but will probably still be swallowed up by other memory use on active regions. Tests have shown no noticeable impact on speed of processing incoming packets, though setting remains in case a switch back is needed.
| * Add AllowRegionRestartFromClient setting to [EstateManagement] section of ↵Justin Clark-Casey (justincc)2012-11-231-0/+6
| | | | | | | | | | | | | | | | | | OpenSim.ini. Setting this to false will block all restart requests from the viewer even if they are otherwise legitimate. One use is to block region restarts if necessary whilst restart functionality remains buggy or triggers bugs in modules, though these should be fixed as soon as practicable. Default is true, as has been the case historically.
* | Merge branch 'master' into careminsterMelanie2012-11-221-1/+2
|\ \ | |/
| * BulletSim: Make avatar capsule so it is not circular.Robert Adams2012-11-211-1/+2
| | | | | | | | | | | | | | | | | | Simple attempt to make avatars better shaped. Replace parameter 'avatarCapsuleRadius' with 'avatarCapsuleWidth' and 'avatarCapsuleDepth'. More tweeking to avatar height calculation. A little better but short avatar's feet are above the terrain and tall avatar's feet are a little below the ground.
* | Merge branch 'master' into careminsterMelanie2012-11-201-14/+0
|\ \ | |/
| * Expose configuration options for the XmlRpcGridRouterBlueWall2012-11-191-14/+0
| | | | | | | | Expose configuration options for the XmlRpcGridRouter to allow simulators to register llRemoteData channels with an external routing service
* | Merge branch 'master' into careminsterMelanie2012-11-111-10/+0
|\ \ | |/
| * remove entry OpenGridProtocol in OpenSimDefaults.ini - module was deletedPixelTomsen2012-11-111-10/+0
| | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
* | Merge branch 'master' into careminsterMelanie2012-11-111-3/+0
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * One more module: EventQueueGetModule. Also making it non-optional for this dll.Diva Canto2012-11-101-3/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-10-301-0/+7
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactoring to use assembly:classname style of configurationSignpostMarv2012-10-291-2/+2
| |
| * Renaming module back to SoundModule as the hypothetical plan was to make ↵SignpostMarv2012-10-291-3/+2
| | | | | | | | another module using the shared region module interface, but this was pointed out by Melanie_T to be mostly pointless.
| * tweaking configuration logic so that the INonSharedRegionModule will load by ↵SignpostMarv2012-10-291-0/+8
| | | | | | | | default
* | Merge branch 'master' into careminsterMelanie2012-10-201-0/+5
|\ \ | |/
| * Add experimental [Groups] MessageOnlineUsersOnly option for Flotsam XmlRpc ↵Justin Clark-Casey (justincc)2012-10-201-0/+5
| | | | | | | | | | | | | | | | | | | | groups. This retrieves and caches information from the PresenceService to only send messages to online users. This is reported to much improve performance for large groups where most users are offline. Cache is 20 seconds to balance requests against users not receiving messages until cache updates. This is an alternative to an approach where login/logout notification is sent directly from simulator to groups service. However, I'm not convinced that this PresenceService approach is actually better. Needs more thought.
* | Merge branch 'master' into careminsterMelanie2012-10-171-1/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * Add optional pool for the UDPPacketBuffer objects that handle all incoming ↵Justin Clark-Casey (justincc)2012-10-161-1/+5
| | | | | | | | | | | | | | | | UDP data. Even when an avatar is standing still, it's sending in a constant stream of AgentUpdate packets that the client creates new UDPPacketBuffer objects to handle. This option pools those objects. This reduces memory churn. Currently off by default. Works but the scope can be expanded.
* | Merge branch 'master' into careminsterMelanie2012-10-121-0/+9
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * av_av_collisions_off = false OdePhysics Settings in OpenSimDefaults.ini - ↵teravus2012-10-091-0/+3
| | | | | | | | No Avatar Avatar Collisions. This causes avatar to be able to walk through each other as if they're ghosts but still interact with the environment.
| * Add config option to plant avatar where they are reducing avatar avatar ↵teravus2012-10-091-0/+6
| | | | | | | | 'pushability' av_planted see OpenSimDefaults.ini. Use when you have unruly visitors that rudely push each other around. Still allows a small amount of movement based on the avatar movement PID controller settings. You can increase the spring tension in the PID controller and really prevent any movement if you would like.
* | Merge branch 'master' into careminsterMelanie2012-10-071-0/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| * Make the asset retrieval concurrency a config switch. The current valueMic Bowman2012-10-041-0/+4
| | | | | | | | | | of 30 is still hanging badly on some mono versions. The switch defaults to 30 to preserve current behavior.
* | Merge branch 'master' into careminsterMelanie2012-09-291-27/+24
|\ \ | |/ | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * BulletSim: btGhostObjects working to make 'volume detect' work.Robert Adams2012-09-271-3/+3
| | | | | | | | | | | | | | | | | | | | Rearrangement and cleanup of shape collection code. Much more readable. Enabling and use of collision filters and masks. Addition of ID to body creation BulletSimAPI calls so always set in shape for collision reporting. Change default of ShouldSplitSimulationIslands and ShouldRandomizeSolverOrder from 'false' to 'true'. When 'false', this suppresses NO_CONTACT_RESPONSE which makes volume detect fail.
| * Comment out unused RestPlugins text in OpenSimDefaults.iniJustin Clark-Casey (justincc)2012-09-281-24/+25
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-271-0/+4
| |\
| | * Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.Justin Clark-Casey (justincc)2012-09-271-0/+4
| | | | | | | | | | | | | | | | | | This controls how many undo steps the simulator will store for each prim. Default is now 20 rather than 5 as it briefly was. The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
| * | Removed the bits about the TOSModule. That module doesn't go into core. ↵Diva Canto2012-09-271-4/+0
| |/ | | | | | | WARNING: migration on GridUser withdrawn too, but left the migration number there.
* | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-271-0/+4
|\ \ | |/
| * TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-251-0/+4
| |
* | Merge branch 'master' into careminsterMelanie2012-09-241-4/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Make ResendAppearanceUpdates = true by default in [Appearance] in ↵Justin Clark-Casey (justincc)2012-09-201-2/+1
| | | | | | | | | | | | | | | | | | OpenSimDefaults.ini. This resends appearance uuids to avatars in the scene once a minute. I have seen this help in the past resolve grey appearance problems where viewers have for unknown reasons sometimes ignored the packet. The overhead is very small since only the UUIDs are sent - the viewer then requests the texture only if it does not have it cached. This setting will not help with cloudy avatars which are usually due to the viewer not uploading baked texture data or uploading something that isn't valid JPEG2000
| * Fix some inconsistencies in configurartion: NonPhys primsBlueWall2012-09-181-2/+2
| | | | | | | | | | | | Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*. Please update your OpenSim.ini and Regions.ini to reflect these changes.
* | Merge branch 'master' into careminsterMelanie2012-09-161-3/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * Fix indentation and issues where tabs were used instead of spaces in commit ↵Justin Clark-Casey (justincc)2012-09-121-3/+3
| | | | | | | | 783ee949
* | Merge branch 'master' into careminsterMelanie2012-09-091-0/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * implementing per-region configuration of limits on the number of prims one ↵SignpostMarv2012-09-091-0/+4
| | | | | | | | | | | | | | | | can have in a linkset Applied with changes - patch was based on a repo different from core Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2012-09-071-0/+7
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * If reusing dynamic textures, do not reuse small data length textures that ↵Justin Clark-Casey (justincc)2012-09-061-0/+7
| | | | | | | | | | | | | | | | | | fall below current viewer discard level 2 thresholds. Viewer LL 3.3.4 and before sometimes fail to properly redisplay dynamic textures that have a small data length compared to pixel size when pulled from cache. This appears to happen when the data length is smaller than the estimate discard level 2 size the viewer uses when making this GetTexture request. This commit works around this by always regenerating dynamic textures that fall below this threshold rather than reusing them if ReuseDynamicTextures = true This can be controlled by the [Textures] ReuseDynamicLowDataTextures config setting which defaults to false.
* | 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
generated by cgit v1.1 at 2024-11-18 15:33:20 +0000