OpenSimMirror/bin/config-include
Diva Canto 7ab633461e Fixed merge conflicts
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
2015-10-18 16:24:33 -07:00
..
storage
CenomeCache.ini.example
FlotsamCache.ini.example
Grid.ini
GridCommon.ini.example
GridHypergrid.ini
HyperSimianGrid.ini
SimianGrid.ini
Standalone.ini Fixed merge conflicts 2015-10-18 16:24:33 -07:00
StandaloneCommon.ini.example Deleted access control spec from [LoginService] section of standalone config. It's in OpenSim.ini now under [AccessControl]. Backwards compatibility preserved. 2015-09-06 10:02:16 -07:00
StandaloneHypergrid.ini Fixed merge conflicts 2015-10-18 16:24:33 -07:00
osslEnable.ini