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 /bin/config-include/StandaloneHypergrid.ini | |
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 '')
-rw-r--r-- | bin/config-include/StandaloneHypergrid.ini | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 51f7fd0..eaacfff 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -39,21 +39,6 @@ | |||
39 | SimulationServiceInConnector = true | 39 | SimulationServiceInConnector = true |
40 | MapImageServiceInConnector = true | 40 | MapImageServiceInConnector = true |
41 | 41 | ||
42 | [SimulationService] | ||
43 | ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport | ||
44 | ; It is used to control the teleport handoff process. | ||
45 | ; Valid values are | ||
46 | ; "SIMULATION/0.3" | ||
47 | ; - This is the default, and it supports teleports to variable-sized regions | ||
48 | ; - Older versions can teleport to this one, but only if the destination region | ||
49 | ; is 256x256 | ||
50 | ; "SIMULATION/0.2" | ||
51 | ; - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol | ||
52 | ; - this protocol is more efficient than "SIMULATION/0.1" | ||
53 | ; "SIMULATION/0.1" | ||
54 | ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. | ||
55 | ConnectorProtocolVersion = "SIMULATION/0.3" | ||
56 | |||
57 | [Messaging] | 42 | [Messaging] |
58 | MessageTransferModule = HGMessageTransferModule | 43 | MessageTransferModule = HGMessageTransferModule |
59 | LureModule = HGLureModule | 44 | LureModule = HGLureModule |