diff options
| author | Diva Canto | 2015-10-18 16:06:31 -0700 |
|---|---|---|
| committer | Diva Canto | 2015-10-18 16:24:33 -0700 |
| commit | 7ab633461ed65d1080b569532020379a068352b5 (patch) | |
| tree | ec1efcb5e8d207e62b494f4d3ce404d6d61e1aaf /OpenSim/Framework/Monitoring | |
| parent | The protocol version checking on the grid server connector seemed to have a b... (diff) | |
| download | opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.zip opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.tar.gz opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.tar.bz2 opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.tar.xz | |
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
Diffstat (limited to 'OpenSim/Framework/Monitoring')
0 files changed, 0 insertions, 0 deletions