aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.ini.example (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'master' into httptestsUbitUmarov2016-11-161-10/+8
| |\ \ | | |/
| | * mantis 8055: fix default value of npc optionsUbitUmarov2016-11-121-8/+8
| | |
| | * reduce diferencs btw OpenSimDefaults.ini and OpenSim.ini.exampleUbitUmarov2016-11-111-6/+4
| | |
| * | Merge branch 'master' into httptestsUbitUmarov2016-11-031-0/+7
| |\ \ | | |/
| | * fix some coments, thanks Austin TateUbitUmarov2016-11-031-1/+1
| | |
| | * XEngine: make calls to gc.collect on region startup scripts loading a ↵UbitUmarov2016-11-031-0/+7
| | | | | | | | | | | | configurable option, since it is very slow operation
| * | Merge branch 'master' into httptestsUbitUmarov2016-10-211-3/+5
| |\ \ | | |/
| | * fix a coment on OpenSim.ini.example ( mantis 8037)UbitUmarov2016-10-161-1/+1
| | |
| | * Xengine option AppDomainLoading default option true is causing problems with ↵UbitUmarov2016-10-151-2/+4
| | | | | | | | | | | | several mono versions. Until a fix is found change the default to false, so this is not a major problem for the less technical skilled users.
| * | change some coments relative to ssl in config filesUbitUmarov2016-10-101-11/+44
| |/
| * remove region combine option (mega region) for config ini filesUbitUmarov2016-08-211-9/+0
| |
| * add test option ObjectsCullingByDistance. In future, if true, it mayUbitUmarov2016-07-061-0/+3
| | | | | | | | | | prevent sending objects outside view range to viewers. DO NOT SET TRUE unless testing it. Code still not completei!!!
| * Mantis #7934 and related: landing points and telehubs for gods. Added a new ↵Diva Canto2016-06-231-0/+5
| | | | | | | | configuration variable LandingPointBehavior that can switch between what we're used to in OpenSim and the behavior in SL.
| * Expand on the comment on the new HTTP limit feature.Melanie Thielker2016-03-141-0/+5
| |
| * Implement parameterization of HTTP_BODY_MAXLENGTH maximum as proposed in ↵Jeff Kelley2016-03-141-0/+6
| | | | | | | | Mantis 7839.
| * change parcel_owner_is_god configuration option from default from true to ↵UbitUmarov2016-01-301-2/+2
| | | | | | | | false, leaving only region_owner true by default
| * add the option to not display parcel ban linesUbitUmarov2015-12-161-1/+4
| |
| * add missing Xengine MinTimerInterval to opensim.ini.exampleUbitUmarov2015-11-271-0/+3
| |
| * change ScriptStopStrategy to the default value co-op (mantis 7740UbitUmarov2015-11-201-1/+1
| |
| * Merge branch 'master' into avinationmergeUbitUmarov2015-11-121-9/+8
| |\
| | * Corrections to ini example files for standalones v2Ai Austin2015-11-121-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "currently unused" indicators for some parameters and add missing "DestinationGuide" parameter in [GridServiceInfo] in StandaloneCommon.ini.example as they do work for a standalone. Regularize example URLs for externally provided web page and economy helper information for uniformity. Correct mistake in reference to grid wide DestinationGuide in override capability in OpenSim.ini.example. Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
| * | change opensim.ini.example to reflect the changes to npc creation optionsUbitUmarov2015-10-081-5/+4
| | |
| * | add several options for NPC creation so abusive use can be reduced ↵UbitUmarov2015-09-301-0/+15
| | | | | | | | | | | | (restrictive by default) UNTESTED
| * | remove coment asking to check ODEPhysicsSettings section. That was because ↵UbitUmarov2015-09-141-1/+0
| | | | | | | | | | | | of diferent setting for av_density for ubODE no longer needed
| * | add entries the the ini.example files for ubODEUbitUmarov2015-09-121-2/+6
| | |
| * | Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-081-3/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | This integrates the OpenSim refactoring to make physics, etc into modules. AVN physics hasn't been moved to new location. Does not compile yet. Merge branch 'osmaster' into mbworknew1
| | * Clean up viewer-based access control specifications.Diva Canto2015-09-061-3/+4
| | |
| * | bad merge?UbitUmarov2015-09-011-4/+0
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into careminsterMelanie2014-01-281-0/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| | * \ Merge branch 'master' into careminsterMelanie2013-12-071-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * \ \ Merge branch 'master' into careminsterMelanie2013-11-231-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| | * \ \ \ Merge branch 'master' into careminsterMelanie2013-10-041-25/+26
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-071-4/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-291-3/+9
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-181-6/+14
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-041-0/+6
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-081-1/+3
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-131-0/+7
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-111-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-051-0/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-011-64/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-281-17/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-271-4/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-261-26/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-231-2/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-221-19/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-041-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-01-241-7/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-01-021-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-12-261-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \