aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini (follow)
Commit message (Collapse)AuthorAgeFilesLines
* add cap GroupMemberDataUbitUmarov2016-08-191-0/+1
|
* allow cap HomeLocation to be disabled setting Cap_HomeLocation = ""UbitUmarov2016-08-181-1/+1
|
* add test option ObjectsCullingByDistance. In future, if true, it mayUbitUmarov2016-07-061-0/+4
| | | | | prevent sending objects outside view range to viewers. DO NOT SET TRUE unless testing it. Code still not completei!!!
* New config var: DisableObjectTransfer. If set to True, objects never cross; ↵Diva Canto2016-07-031-0/+4
| | | | instead they stay in the region, possibly placed outside its borders.
* 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.
* Remove "f" (float) type markers that may have crept in through copypasta.Melanie Thielker2016-04-151-6/+6
|
* 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-1/+1
| | | | false, leaving only region_owner true by default
* update OpenSimDefaults.iniUbitUmarov2016-01-261-5/+11
|
* update the xmlrpcGroups http keep alive option, and comentUbitUmarov2015-12-191-4/+2
|
* add the option to not display parcel ban linesUbitUmarov2015-12-161-0/+3
|
* Mantis #7765: Add new ClampNegativeZ option. Defaults to false to restore ↵Melanie Thielker2015-11-261-0/+3
| | | | | | prior functionality. Avination code wasn't designed for deep building.
* add LegacySitOffsets option to configuration fileUbitUmarov2015-11-171-0/+7
|
* Merge branch 'master' into avinationmerge0.9.0Melanie Thielker2015-11-161-5/+5
|\ | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs
| * Fixed typosDiva Canto2015-11-121-5/+5
| |
| * configuration options relative to last tow commitsUbitUmarov2015-11-131-0/+18
| |
| * Fix an issue introduced in 70a46fe0907c822a5244e36c338bf559ffbec965. I ↵Diva Canto2015-10-211-0/+1
| | | | | | | | accidentally deleted the entire [EntityTransfer] section instead of just a few variables in it.
| * Clean up of simulation version, the number that rules the compatibility of ↵Diva Canto2015-10-181-15/+0
| | | | | | | | | | | | | | | | teleports: - It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure - Its definition moved to the global VersionInfo class As of now it's still 0.3.
* | Add some values to the SimulatorFeatures cap's OpenSimExtras section:Melanie Thielker2015-11-121-1/+9
| | | | | | | | | | | | | | | | SimulatorFPS: The actual optimal FPS of the simulator, un-fudged SimulatorFPSFactor: The fudge factor that is applied to the stats sent to the viewer SimulatorFPSWarnPercent: The percentage below which a lag meter should go to amber SimulatorFPSCritPercent: The percentage below which a lag meter should go to red To display the real values, a viewer would divide the reported FPS by the SimulatorFPSFactor and use that to calculate the percentage of SimulatorFPS. E.g. reported is 55fps, SimulatorFPSFactor is 5.0 and SimulatorFPS is 11.
* | fix: set Normalized55FPS default to TRUEUbitUmarov2015-11-091-1/+1
| |
* | replace StatisticsFPSfactor that needed to be changed with FrameTime to a ↵UbitUmarov2015-11-091-9/+9
| | | | | | | | simpler true or false Normalized55FPS that is now TRUE by default. Incorrectly this commit also contains changes that should had their own commits: changes to heartbeat time control ant to gathering and calculation of related statistics.
* | add StatisticsFPSfactor configuration option (fudge factor) with default of ↵UbitUmarov2015-11-081-13/+31
| | | | | | | | 1.0 (inactive), corresponding to current decision. rename MinFrameTime as FrameTime, change its value and ODE step time. Changed several related coments. (someone may need to translate them to proper english)
* | Fix an issue introduced in 70a46fe0907c822a5244e36c338bf559ffbec965. I ↵Diva Canto2015-10-211-0/+1
| | | | | | | | accidentally deleted the entire [EntityTransfer] section instead of just a few variables in it.
* | we do not have prims with size 2^128...UbitUmarov2015-10-211-6/+5
| |
* | also on OpenSimDefaults.iniUbitUmarov2015-10-211-15/+5
| |
* | Fixed merge conflictsDiva Canto2015-10-181-15/+0
| | | | | | | | | | | | | | | | | | | | Clean up of simulation version, the number that rules the compatibility of teleports: - It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure - Its definition moved to the global VersionInfo class As of now it's still 0.3. Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
* | Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-081-0/+8
|\ \ | |/ | | | | | | | | | | | | 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-0/+8
| |
* | bad merge?UbitUmarov2015-09-011-2/+2
|\ \ | |/ |/|
| * Merge branch 'master' into careminsterMelanie2014-01-281-0/+10
| |\ | | | | | | | | | | | | | | | | | | | | | 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-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-11-031-6/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-10-041-24/+50
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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
| * \ \ \ \ \ 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
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-011-0/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-291-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ \ \ \ 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' into careminsterMelanie2013-05-081-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-131-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-011-48/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-261-26/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-081-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-061-14/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
generated by cgit v1.1 at 2024-11-19 03:06:47 +0000