75ad210b6b
it is nice to save a file to atually change it...
2016-11-23 20:44:55 +00:00
ec8393571f
Merge branch 'master' into httptests
2016-11-16 13:07:23 +00:00
b6329fb784
mantis 8055: fix default value of npc options
2016-11-12 14:07:40 +00:00
c5d85b5465
reduce diferencs btw OpenSimDefaults.ini and OpenSim.ini.example
2016-11-11 16:04:20 +00:00
01a4a883e0
Merge branch 'master' into httptests
2016-11-03 14:01:35 +00:00
4b326f8691
fix some coments, thanks Austin Tate
2016-11-03 14:00:45 +00:00
73b20c2ca2
XEngine: make calls to gc.collect on region startup scripts loading a configurable option, since it is very slow operation
2016-11-03 12:58:43 +00:00
2ce0673af2
Merge branch 'master' into httptests
2016-10-21 17:58:17 +01:00
eaac332d00
fix a coment on OpenSim.ini.example ( mantis 8037)
2016-10-16 17:33:39 +01:00
90be326457
Xengine option AppDomainLoading default option true is causing problems with 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.
2016-10-15 21:06:17 +01:00
6b0094645c
change some coments relative to ssl in config files
2016-10-10 20:14:02 +01:00
c631ffb943
remove region combine option (mega region) for config ini files
2016-08-21 06:49:16 +01:00
c02fe98b7d
add test option ObjectsCullingByDistance. In future, if true, it may
...
prevent sending objects outside view range to viewers. DO NOT SET TRUE
unless testing it. Code still not completei!!!
2016-07-06 16:13:27 +01:00
b522f0916a
Mantis #7934 and related: landing points and telehubs for gods. Added a new configuration variable LandingPointBehavior that can switch between what we're used to in OpenSim and the behavior in SL.
2016-06-23 11:44:59 -07:00
39f7c4a292
Expand on the comment on the new HTTP limit feature.
2016-03-14 16:11:37 +01:00
41644bbfa9
Implement parameterization of HTTP_BODY_MAXLENGTH maximum as proposed in Mantis 7839.
2016-03-14 16:08:49 +01:00
170acd7d67
change parcel_owner_is_god configuration option from default from true to false, leaving only region_owner true by default
2016-01-30 15:42:59 +00:00
a5a31114b2
add the option to not display parcel ban lines
2015-12-16 22:22:26 +00:00
37d7576d67
add missing Xengine MinTimerInterval to opensim.ini.example
2015-11-27 19:25:56 +00:00
ad6080bb0b
change ScriptStopStrategy to the default value co-op (mantis 7740
2015-11-20 15:48:17 +00:00
f037f8335e
Merge branch 'master' into avinationmerge
2015-11-12 23:04:04 +00:00
c4d225ed50
Corrections to ini example files for standalones v2
...
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>
2015-11-12 12:44:53 -05:00
40dc2541ff
change opensim.ini.example to reflect the changes to npc creation options
2015-10-08 02:45:24 +01:00
feb78b2910
add several options for NPC creation so abusive use can be reduced (restrictive by default) UNTESTED
2015-09-30 02:45:11 +01:00
67984ca273
remove coment asking to check ODEPhysicsSettings section. That was because of diferent setting for av_density for ubODE no longer needed
2015-09-14 23:47:05 +01:00
caf298cda3
add entries the the ini.example files for ubODE
2015-09-12 21:46:40 +01:00
e5367d822b
Merge of ubitworkvarnew with opensim/master as of 20150905.
...
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
2015-09-08 04:54:16 -07:00
82ea4179da
Clean up viewer-based access control specifications.
2015-09-06 10:00:20 -07:00
371c9dd2af
bad merge?
2015-09-01 14:54:35 +01:00
9b5bd4b279
Fixed comment in ini related to previous patch
2015-08-25 20:43:22 -07:00
9d104f5453
Changes to .ini.example files to improve instructions and workflow for standalone setups
...
Clarify what must be changed in initial .ini files to create a working
standalone setup now that [Const] variables are used. Fix separator used
in one of choice lists for [Const] BaseURL descriptor. Minor changes to
line spacing of some sections in StandaloneCommon.ini.example file for
layout regularity. Correction of a typo in comment.
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-08-25 20:42:02 -07:00
3a27b47593
Refine comments .ini file setup for new Standalone
...
Helpful comment for setting [const] section of OpenSim.ini to allow for
standalone. Correction to StandaloneCommon.ini.example as
[GridInfoServices] welcome parameter does work and is also useful for
standalones.
2015-08-21 18:42:21 +02:00
7edaf1d851
Add MaxMaterialsPerTransaction to SimFeatures
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-06-19 08:44:34 -07:00
53502e8694
Added example of how to configure the GodNames module
2015-06-13 14:41:50 -07:00
67d4e4475f
Small fix for ini comments
2015-04-15 15:55:47 -04:00
e4e58fad32
Enable OSSL functions by default using the osslEnable.ini configuration file.
...
This changes OpenSim.ini.example to, by default, include osslEnable.ini which
turns on the OSSL functions and limits who can do which operations.
2015-04-14 07:17:54 -07:00
520e6ed6f3
Remove ossl settings in XEngine section of OpenSim.ini.example with note to where
...
they were moved. At the moment, ossl settings are in the XEngine section although
they should apply to any LSLish script engine. Moves all ossl settings to osslEnable.ini
Update osslEnable.ini with more decriptive comments and set some functions to be more
restrictive -- especially the functions that allow scripts to do things to other
avatars and prims.
2015-04-14 06:18:25 -07:00
2a302d9a32
Move osslEnable.ini file from bin/ to bin/config-include.
...
Per comments, putting new configuration files in bin/ is not preferred.
Add comments and instructions to heading of osslEnable.ini.
Add a commented out include of osslEnable.ini to OpenSim.ini.example.
Fix line endings of osslEnable.ini to be Unix style.
2015-04-12 16:00:54 -07:00
7d3bafd5ab
Add outbound URL filter to llHttpRequest() and osSetDynamicTextureURL*() script functions.
...
This is to address an issue where HTTP script functions could make calls to localhost and other endpoints inside the simulator's LAN.
By default, calls to all private addresses are now blocked as per http://en.wikipedia.org/wiki/Reserved_IP_addresses
If you require exceptions to this, configure [Network] OutboundDisallowForUserScriptsExcept in OpenSim.ini
2015-03-04 18:27:50 +00:00
85133daae0
minor: Add explanation that [Startup] CombineContiguousRegions should be false for varregions.
2015-02-19 21:47:02 +00:00
d9bfc710c0
Replace the tabs that have crept into isolated places in config and config example files with spaces
2015-01-21 00:54:13 +00:00
72814245be
Also deleted the option of setting Cap_WebFetchInventoryDescendents from OpenSim.ini.example
2015-01-14 06:33:15 -08:00
e2dd15625f
Added GetDisplayNames capability. For now, we don't actually use display names, and this cap returns the regular name. But this moves the server side into the newer, preferred, protocol used by the viewer for fetching the names of agents in the scene given their UUIDs. (the old protocol is via UDP). This works fine in my limited tests, but could use further testing by others.
2015-01-09 08:31:56 -08:00
46ab59723d
Added a different/better way of specifying data services in DataSnapshot -- using DATA_SRV_ keys, one per service. This allows 3rd party modules to add data services automatically.
2015-01-07 11:04:23 -08:00
383a1a6fe1
Fix typo in OpenSim.ini.example
2015-01-04 18:52:37 -05:00
faea742f32
Slight change in the way region module addins handle their configuration. Rather than opensim grabbing their config file automatically from the addins folder, it's the module's responsibility to read its own config file. This makes it consistent with Robust-bound addins.
2015-01-02 13:32:20 -08:00
a88bc50a16
Add support for expansion of key values in nini config files.
...
Add loading of 3rd-party addin inis automatically.
2014-12-30 20:05:12 -08:00
caa7b1e6a1
Fix typo in ini
2014-12-01 10:15:56 -05:00
5f88ceab22
Set configuration files to use key expansion for widely used common settings.
2014-11-30 13:59:23 -05:00
124be38f74
Add [BulletSim] option AvatarToAvatarCollisionsByDefault to control whether avatars collide. This is true by default.
...
This is implemented with a new collision type (PhantomToOthersAvatar) to potentially allow colliding and non-colliding avatars to be present in the same scene.
So there is no provision yet for giving avatars different collision types.
This commit replaces the temporary change in commit f3eaa6d8
2014-11-25 23:23:11 +00:00
bde60cc92e
Add persistent command history in console
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2014-09-23 10:36:00 -04:00
10a8d2852e
OpenSimExtras
...
Move the experimental extra features functionality into the GridService. This sends default values for map, search and destination guide, plus ExportSupported control to the region on startup. Please watch http://opensimulator.org/wiki/SimulatorFeatures_Extras for changes and documentation.
2014-08-06 17:25:12 -04:00
cac910d401
Add region-side extra feature setting for destination guide
2014-07-31 08:20:06 -04:00
e0d8f42e6b
Simulator Extra Features Service
...
Provide a means for regions to fetch extra features supported by modern viewers from a central location
.
2014-07-30 11:24:39 -04:00
46781253c3
fix comments in physics section of [Startup] to reflect the actual default engine.
2014-07-25 12:30:09 -04:00
20f20895cf
Adds optional HTTP Basic Authentication to Robust service connectors.
2014-05-23 16:19:43 -07:00
77a331fce3
Add DebugMessagingEnabled = false to OpenSim.ini.example for consistency. Slightly simplify config comments.
2014-05-19 23:00:04 +01:00
539165e6bd
minor: Change configuration text in config files to reflect the existing situation of BulletSim as the default physics engine.
2014-05-06 17:28:21 +01:00
5a10da3ee8
Added a optional key between the group remote connectors, sim and service. This allows for more secure group services, to be used by collections of mutually-trusting grids.
2014-05-03 17:13:53 -07:00
af54e6f370
minor: Change incorrect "Maximum" in the PhysicalPrimMin OpenSim.ini.example description to "Minimum"
...
Thanks to aiaustin for the spot.
2014-03-26 23:45:02 +00:00
e7fa8a4699
minor: change misspelling of overriden to overridden in comments within config files
...
Thanks to aiaustin for the spot.
2014-03-26 23:43:49 +00:00
cffea984f1
minor: Remove "js" (Javascript) from list of allowed languages in script config since it hasn't been present in OpenSimulator for a very long time (0.6 days)
...
One reason support was removed is that the external DLL that implemented Javascript stopped development.
Not sure how well this ever worked in OpenSimulator.
Not removing vb for now as this is directly supported by Mono (via vbnc compiler) though I strongly suspect it is also inoperable.
2014-03-26 00:50:33 +00:00
61353dde80
Allow Region specific static maptiles to be loaded from file.
2014-03-18 22:18:50 -07:00
71c808cd32
PhysicalPrimMax 64m for OpenSim_ini_example standard size prim
...
Signed-off-by: Robert Adams <misterblue@misterblue.com>
2014-03-10 22:11:24 -07:00
1aed6567a8
Samle configurations for the baked texture server.
2014-02-04 02:49:13 +00:00
c6e9db5866
Merge branch 'master' into careminster
...
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
2014-01-28 21:02:20 +00:00
4c362a83f9
Merge branch 'master' into varregion
2014-01-21 11:31:51 -08:00
3018b2c5d7
Materials module: a) Store materials as assets; b) Finalized it (removed the "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'.
2014-01-20 00:38:42 -08:00
54a4b9eab4
varregion: Update Warp3D to properly handle varregions.
...
This includes additions to Warp3D:
Optional rendering of mesh and scupltie prims (INI parameter. Off by default)
Texturing of large prims (INI parameter. On by default)
Better garbage collection
2014-01-19 07:33:56 -08:00
6d6b9ab791
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-12-07 01:08:49 +00:00
13017034b1
minor: Change ProfileServiceURL reference in OpenSim.ini.example to be consistent
2013-11-28 00:23:27 +00:00
3589acdab1
Merge branch 'master' into careminster
...
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
52ff860f30
minor: Make PID file examples in OpenSim and Robust config somewhat more meaningful than just /tmp/my.pid
2013-11-06 23:27:19 +00:00
75c68fa29e
Merge branch 'master' into careminster
...
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
2013-10-04 20:03:12 +01:00
70b51f12cd
minor: Clean up tabbing and spacing issues in OpenSim.ini.example
2013-09-27 00:01:18 +01:00
005c69511d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-08-07 23:29:42 +01:00
dbd773e89e
Amend to last commit -- remove the obsolete var from OpenSim.ini.example
2013-08-07 10:04:53 -07:00
bf283208df
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-07-29 02:08:05 +01:00
9cbbb7eddf
Clarification on docs of .ini.examples for Groups (again)
2013-07-27 19:16:48 -07:00
1572e91b5f
Clarifications on documentation of Group configs
2013-07-27 08:04:48 -07:00
7830cc9954
Merge branch 'master' into careminster
...
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
2013-07-18 10:08:10 +01:00
d48946f9ef
Document obscure Groups config related to the user level required for creating groups
2013-07-14 16:51:07 -07:00
f2f33b7577
Some consistency fixes for the ini to stop parser breakage
2013-07-04 17:45:17 -04:00
648e258b8e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
2013-06-04 21:09:25 +01:00
ba2f13db63
Adding back the BasicProfileModule
2013-05-31 21:19:15 -04:00
328883700a
UserProfiles
...
UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
2013-05-30 17:59:18 -04:00
bda4565067
Merge branch 'master' into careminster
...
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
2013-05-08 20:59:44 +01:00
e92c05ebbd
Added AvatarPickerSearch capability handler.
2013-05-07 18:01:48 -07:00
710381e838
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
2013-03-13 02:02:46 +00:00
fb1211ad5e
Add DisableInterRegionTeleportCancellation option in [EntityTransfer] 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.
2013-03-12 23:01:27 +00:00
1e7c7fb779
Merge branch 'master' into careminster
2013-03-11 19:09:49 +00:00
13f3bcae94
Update comment about setting physics=BulletSimN as the C# Bullet
...
version has been wrapped into one BulletSim and the physics engine
selection is now done as specified in OpenSimDefaults.ini.
2013-03-10 22:24:34 -07:00
81552f41c6
Merge branch 'master' into careminster
...
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
2013-03-05 23:57:53 +00:00
1bc8692a99
Move AllowedClients and BannedClients section to new [AccessControl] section 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]
2013-03-02 01:43:54 +00:00
4999d7920a
Revert "Removed more vars from [Startup]. I think these were already moved elsewhere, because I can't find any reference to them in the code."
...
This reverts commit efa7227865
2013-03-02 01:23:01 +00:00
a675f7d4c3
Merge branch 'master' into careminster
2013-03-01 23:54:00 +00:00
20530ee667
Moved permissions config vars out of [Startup] into [Permissions]. Backwards compatible ([Startup] still being looked up), but please update your configs sometime soon.
2013-03-01 15:24:22 -08:00
efa7227865
Removed more vars from [Startup]. I think these were already moved elsewhere, because I can't find any reference to them in the code.
2013-03-01 14:18:01 -08:00
eb9458fd7e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
2013-02-28 21:20:07 +00:00
64b8ce73da
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-27 20:50:03 -08:00
UbitUmarov