aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.ini.example (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-201-0/+6
| | | | | | | | | | | | "Demo" label; removed most of the logging); c) Enabled by default Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
* | 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
| * minor: Change ProfileServiceURL reference in OpenSim.ini.example to be ↵Justin Clark-Casey (justincc)2013-11-281-1/+1
| | | | | | | | consistent
* | 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
| * minor: Make PID file examples in OpenSim and Robust config somewhat more ↵Justin Clark-Casey (justincc)2013-11-061-1/+1
| | | | | | | | meaningful than just /tmp/my.pid
* | 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
| * minor: Clean up tabbing and spacing issues in OpenSim.ini.exampleJustin Clark-Casey (justincc)2013-09-271-25/+26
| |
* | 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
| * Amend to last commit -- remove the obsolete var from OpenSim.ini.exampleDiva Canto2013-08-071-4/+0
| |
* | Merge branch 'master' into careminsterMelanie2013-07-291-3/+9
|\ \ | |/ | | | | | | | | 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-2/+2
| |
| * Clarifications on documentation of Group configsDiva Canto2013-07-271-3/+9
| |
* | 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
| * Document obscure Groups config related to the user level required for ↵Diva Canto2013-07-141-0/+4
| | | | | | | | creating groups
| * Some consistency fixes for the ini to stop parser breakageBlueWall2013-07-041-6/+10
| |
* | 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
| * Adding back the BasicProfileModuleBlueWall2013-05-311-2/+2
| |
| * UserProfilesBlueWall2013-05-301-0/+6
| | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
* | 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
| * Added AvatarPickerSearch capability handler.Diva Canto2013-05-071-1/+3
| |
* | Merge branch 'master' into careminsterMelanie2013-03-131-0/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
| * Add DisableInterRegionTeleportCancellation option in [EntityTransfer] ↵Justin Clark-Casey (justincc)2013-03-121-0/+7
| | | | | | | | | | | | | | | | | | 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-111-2/+1
|\ \ | |/
| * Update comment about setting physics=BulletSimN as the C# BulletRobert Adams2013-03-101-2/+1
| | | | | | | | | | version has been wrapped into one BulletSim and the physics engine selection is now done as specified in OpenSimDefaults.ini.
* | 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
| * Move AllowedClients and BannedClients section to new [AccessControl] section ↵Justin Clark-Casey (justincc)2013-03-021-2/+6
| | | | | | | | | | | | | | in OpenSim.ini from [Startup] This change also corrects the setting names - they were actually wrong (though the text in {} was correct). If there are settings in [Startup] they will continue to be used and anything there will override settings in [AccessControl]
| * Revert "Removed more vars from [Startup]. I think these were already moved ↵Justin Clark-Casey (justincc)2013-03-021-0/+20
| | | | | | | | | | | | elsewhere, because I can't find any reference to them in the code." This reverts commit efa722786509bd8e02e23f11da974b4282dbd185.
* | Merge branch 'master' into careminsterMelanie2013-03-011-64/+44
|\ \ | |/
| * Moved permissions config vars out of [Startup] into [Permissions]. Backwards ↵Diva Canto2013-03-011-44/+44
| | | | | | | | compatible ([Startup] still being looked up), but please update your configs sometime soon.
| * Removed more vars from [Startup]. I think these were already moved ↵Diva Canto2013-03-011-20/+0
| | | | | | | | elsewhere, because I can't find any reference to them in the code.
* | Merge branch 'master' into careminsterMelanie2013-02-281-17/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-271-4/+11
| |\
| * | Moved the HG default variables out of [Startup] and into their own section ↵Diva Canto2013-02-271-17/+0
| | | | | | | | | | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now.
* | | 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
| * | Improve description of GenerateMapTiles config optionJustin Clark-Casey (justincc)2013-02-271-7/+8
| | |
| * | Add documentation on default or Warp3D image module choice to ↵Justin Clark-Casey (justincc)2013-02-271-0/+6
| |/ | | | | | | | | | | | | OpenSim.ini.example. As before, default is MapImageModule. Thanks to Ai Austin for pointing out this omission.
* | Merge branch 'master' into careminsterMelanie2013-02-261-26/+29
|\ \ | |/
| * Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-251-26/+29
| | | | | | | | | | | | | | 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-231-2/+8
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * More clarification on the [Groups] sectionDiva Canto2013-02-231-0/+1
| |
| * Further clarification on the same spot.Diva Canto2013-02-231-0/+1
| |
| * Improved documentation of Groups section.Diva Canto2013-02-231-2/+6
| |
* | Merge branch 'master' into careminsterMelanie2013-02-221-19/+55
|\ \ | |/
| * Simplification of HG configs: HomeURI and GatekeeperURI now are defined as ↵Diva Canto2013-02-211-0/+16
| | | | | | | | default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
| * First commit of Diva Groups. The Data bits went to OpenSim.Data core, the ↵Diva Canto2013-02-191-15/+29
| | | | | | | | rest to Addons.Groups.dll.
| * Offline IM: moved the Data and MySQL bits to the corresponding places in ↵Diva Canto2013-02-191-3/+3
| | | | | | | | core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that.
| * Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dllDiva Canto2013-02-181-4/+10
| |
* | Merge branch 'master' into careminsterMelanie2013-02-041-3/+4
|\ \ | |/
| * Stop exceptions being thrown if GenerateMapTiles = false but no static map ↵Justin Clark-Casey (justincc)2013-02-021-3/+4
| | | | | | | | tile has been set. Do more informative warn instead.
generated by cgit v1.1 at 2024-12-22 05:44:14 +0000