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

1 files changed, 0 insertions, 15 deletions

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 1fbd171..78ada2b 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -28,21 +28,6 @@
     GridInfoServiceInConnector = true
     MapImageServiceInConnector = true
 
-[SimulationService]
-    ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
-    ; It is used to control the teleport handoff process.
-    ; Valid values are 
-    ; "SIMULATION/0.3" 
-    ;   - This is the default, and it supports teleports to variable-sized regions
-    ;   - Older versions can teleport to this one, but only if the destination region
-    ;     is 256x256
-    ; "SIMULATION/0.2"
-    ;   - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
-    ;   - this protocol is more efficient than "SIMULATION/0.1"
-    ; "SIMULATION/0.1" 
-    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
-    ConnectorProtocolVersion = "SIMULATION/0.3"
-
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"