aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-08-111-0/+7
|\ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add parameter and explanation of ManagedStats return to OpenSimDefaults.ini.Robert Adams2013-08-081-0/+7
| | | | | | | | | | Add 'callback' query parameter to managed stats return to return function form of JSON data.
* | Merge branch 'master' into careminsterMelanie2013-08-071-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Move experimental attachments throttling further down the chain so that ↵Justin Clark-Casey (justincc)2013-08-021-2/+2
| | | | | | | | multiple attachments changes (e.g. change outfit) are also throttled
* | Merge branch 'master' into careminsterMelanie2013-08-011-0/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Add experimental "debug attachments throttle <ms>" setting (command line) ↵Justin Clark-Casey (justincc)2013-08-011-0/+7
| | | | | | | | | | | | | | | | | | | | and ThrottlePer100PrimsRezzed in [Attachments] in config This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously. It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in. Default is 0 (no throttling). "debug attachments <level>" changes to "debug attachments log <level>" which controls logging. A logging level of 1 will show the throttling performed if applicable. Also adds "debug attachments status" command to show current throttle and debug logging levels.
* | Merge branch 'master' into careminsterMelanie2013-07-291-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Clarification on docs of .ini.examples for Groups (again)Diva Canto2013-07-271-0/+1
| |
| * Clarifications on documentation of Group configsDiva Canto2013-07-271-1/+0
| |
* | Merge branch 'master' into careminsterMelanie2013-07-251-0/+7
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs bin/OpenSimDefaults.ini
| * Added config var that we all thought was already there: see_into_region. ↵Diva Canto2013-07-241-0/+3
| | | | | | | | (Note: different from the defunct see_into_neighboring_sim, which used to control the process from the other end). This enables child agents in neighbors for which the root agent doesn't have permission to be in.
* | Merge branch 'master' into careminsterMelanie2013-07-241-0/+4
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Improvements to the ServiceThrottleModule: added a category and an itemid to ↵Diva Canto2013-07-161-0/+4
| | | | | | | | the interface, so that duplicate requests aren't enqueued more than once.
* | Merge branch 'master' into careminsterMelanie2013-07-181-19/+37
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * BulletSim: implementation of linkset center-of-mass.Robert Adams2013-07-061-19/+37
| | | | | | | | | | | | Default off, for the moment, until more testing. Add separate thread and center-of-mass flags to OpenSimDefaults.ini. Clean up comments in OpenSimDefaults.ini.
* | Merge branch 'master' into careminsterMelanie2013-06-041-32/+38
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-301-0/+13
| |\
| | * UserProfilesBlueWall2013-05-301-0/+13
| | | | | | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
| * | BulletSim: remove unuseful BulletSim parameters from OpenSimDefaults.ini andRobert Adams2013-05-301-32/+25
| |/ | | | | | | replace with things someone might actually want to tune (avatar height, ...).
* | Merge branch 'master' into careminsterMelanie2013-05-081-0/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | packet can be pulled out of LLClientView and moved to AvatarFactory. The first pass at reusing textures (turned off by default) is included. When reusing textures, if the baked textures from a previous login are still in the asset service (which generally means that they are in the simulator's cache) then the avatar will not need to rebake. This is both a performance improvement (specifically that an avatars baked textures do not need to be sent to other users who have the old textures cached) and a resource improvement (don't have to deal with duplicate bakes in the asset service cache).
* | Merge branch 'master' into careminsterMelanie2013-05-081-1/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * Delete "" entry for AvatarPicker cap.Diva Canto2013-05-071-1/+0
| |
| * Added AvatarPickerSearch capability handler.Diva Canto2013-05-071-0/+4
| |
* | Merge branch 'master' into careminsterMelanie2013-04-101-0/+5
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * Add more notes to async_call_method relating to UnsafeQueueUserWorkItemJustin Clark-Casey (justincc)2013-04-091-0/+5
| | | | | | | | | | UnsafeQueueUserWorkItem is so called because it allows the calling code to escalate its security privileges. However, since we must already trust this code anyway in OpenSimulator this is not an issue.
* | Merge branch 'master' into careminsterMelanie2013-03-131-0/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
| * Add DisableInterRegionTeleportCancellation option in [EntityTransfer] ↵Justin Clark-Casey (justincc)2013-03-121-0/+5
| | | | | | | | | | | | | | | | | | section of OpenSim.ini. False by default. This option allows the simulator to specify that the cancel button on inter-region teleports should never appear. This exists because sometimes cancellation will result in a stuck avatar requiring relog. It may be hard to prevent this due to the protocol design (the LL grid has the same issue) In small controlled grids where teleport failure is practically impossible it can be better to disable teleport cancellation entirely.
* | Merge branch 'master' into careminsterMelanie2013-03-051-0/+4
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * Added existance and default value for [XEngine]MinTimerInterval to ↵Robert Adams2013-03-021-0/+4
| | | | | | | | OpenSimDefaults.ini
* | Merge branch 'master' into careminsterMelanie2013-03-011-48/+49
|\ \ | |/
| * Moved permissions config vars out of [Startup] into [Permissions]. Backwards ↵Diva Canto2013-03-011-48/+49
| | | | | | | | compatible ([Startup] still being looked up), but please update your configs sometime soon.
* | Merge branch 'master' into careminsterMelanie2013-02-261-26/+24
|\ \ | |/
| * Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-251-26/+24
| | | | | | | | | | | | | | Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
* | Merge branch 'master' into careminsterMelanie2013-02-081-0/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * Adds size limits to JsonStore. Adds a separate configurationMic Bowman2013-02-081-0/+4
| | | | | | | | variable to enable binding to dynamic attributes.
* | Merge branch 'master' into careminsterMelanie2013-02-061-14/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * BulletSim: remove degenerate triangles from meshes. This fixes theRobert Adams2013-02-051-14/+2
| | | | | | | | | | | | | | | | | | invisible barriers in sculptie doorways (Mantis 6529). Bump up level-of-detail for physical meshes to 32 (the max). This fixes the invisible barriers that showed up in prim cut arches. NOTE: the default LOD values are removed from OpenSimDefaults.ini. If you don't change your OpenSimDefaults.ini, you will continue to see the arch problem.
* | Merge branch 'master' into careminsterMelanie2013-02-041-1/+0
|\ \ | |/
| * Remove [XMLRPC] section I added by accident to the top of ↵Justin Clark-Casey (justincc)2013-02-041-15/+0
| | | | | | | | OpenSimDefaults.ini in previous commit 95883282
| * Stop exceptions being thrown if GenerateMapTiles = false but no static map ↵Justin Clark-Casey (justincc)2013-02-021-0/+14
| | | | | | | | tile has been set. Do more informative warn instead.
* | Merge branch 'master' into careminsterMelanie2013-01-241-6/+14
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Merge branch 'master' into coopterminationJustin Clark-Casey (justincc)2013-01-241-0/+25
| |\
| * | Add information on ScriptStopStrategy to [XEngine] in OpenSimDefaults.ini ↵Justin Clark-Casey (justincc)2013-01-231-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and OpenSim.ini.example. Default remains abort. This setting controls whether scripts are stopped by aborting their threads externally (abort) or by co-operative checks from the compiled script (co-op) co-op should be more stable but this option is experimental. If moving from co-op to abort, existing script DLLs will need to be recompiled. This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/ One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
* | | Merge branch 'master' into careminsterMelanie2013-01-231-0/+25
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
| * | This updates prebuild to remove BulletSimN, implements the BulletSim API in ↵teravus2013-01-201-0/+14
| | | | | | | | | | | | BulletSPlugin using the BulletXNA Bullet physics engine. It also updates the BulletXNA library to be compatible with the changes. OpenSimDefaults has been updated to describe how to switch engines and terrain implementations.
| * | IRCBridgeModule: optional agent-alertbox for IRC enabled Regions look in ↵PixelTomsen2013-01-191-0/+11
| |/ | | | | | | | | | | | | | | OpenSimDefaults.ini / section [IRC] http://opensimulator.org/mantis/view.php?id=6470 idea: https://github.com/ssm2017/IrcBridgeAlert
* | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-161-8/+0
|\ \ | |/
| * BulletSim: by default, turn on continuious collision detection (CCD)Robert Adams2013-01-151-8/+0
| | | | | | | | | | and enable friction computation caching. Remove dangerous BulletSim settings from OpenSimDefaults.ini.
* | Merge branch 'master' into careminsterMelanie2012-12-301-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
generated by cgit v1.1 at 2025-01-24 19:21:52 +0000