diff options
author | Melanie Thielker | 2015-10-31 00:01:35 +0100 |
---|---|---|
committer | Melanie Thielker | 2015-10-31 00:01:35 +0100 |
commit | dc6d9eadf33b9a0321664d676030b07b2bd04bed (patch) | |
tree | 86d8bd48a294b7e0adaf0c6c85c69f4752382c9f /OpenSim/Services/LLLoginService | |
parent | fix services handling of visualparameters, avoiding possible crashs (mantis 7... (diff) | |
download | opensim-SC_OLD-dc6d9eadf33b9a0321664d676030b07b2bd04bed.zip opensim-SC_OLD-dc6d9eadf33b9a0321664d676030b07b2bd04bed.tar.gz opensim-SC_OLD-dc6d9eadf33b9a0321664d676030b07b2bd04bed.tar.bz2 opensim-SC_OLD-dc6d9eadf33b9a0321664d676030b07b2bd04bed.tar.xz |
Testing stage of the new versioning system. Use at own risk. May not
work. Will eat your babies. Yada. Yada.
Diffstat (limited to 'OpenSim/Services/LLLoginService')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 9e12f9d..4f8f459 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -983,11 +983,10 @@ namespace OpenSim.Services.LLLoginService | |||
983 | 983 | ||
984 | private bool LaunchAgentDirectly(ISimulationService simConnector, GridRegion region, AgentCircuitData aCircuit, TeleportFlags flags, out string reason) | 984 | private bool LaunchAgentDirectly(ISimulationService simConnector, GridRegion region, AgentCircuitData aCircuit, TeleportFlags flags, out string reason) |
985 | { | 985 | { |
986 | string myversion = String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersion); | 986 | float version; |
987 | string version; | ||
988 | 987 | ||
989 | if (!simConnector.QueryAccess( | 988 | if (!simConnector.QueryAccess( |
990 | region, aCircuit.AgentID, null, true, aCircuit.startpos, myversion, new List<UUID>(), out version, out reason)) | 989 | region, aCircuit.AgentID, null, true, aCircuit.startpos, new List<UUID>(), out version, out reason)) |
991 | return false; | 990 | return false; |
992 | 991 | ||
993 | return simConnector.CreateAgent(null, region, aCircuit, (uint)flags, out reason); | 992 | return simConnector.CreateAgent(null, region, aCircuit, (uint)flags, out reason); |