aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Simulation
diff options
context:
space:
mode:
authorMelanie Thielker2015-11-01 19:37:14 +0100
committerMelanie Thielker2015-11-01 19:37:14 +0100
commit5f18f2ce6a4308fe30de8b7816058bd5d4b962ca (patch)
treeb41362f4ea4942110f6ccb5260dc3e2697d20686 /OpenSim/Services/Connectors/Simulation
parentMore plumbing of the EntityTransferContext (not yet complete) (diff)
downloadopensim-SC_OLD-5f18f2ce6a4308fe30de8b7816058bd5d4b962ca.zip
opensim-SC_OLD-5f18f2ce6a4308fe30de8b7816058bd5d4b962ca.tar.gz
opensim-SC_OLD-5f18f2ce6a4308fe30de8b7816058bd5d4b962ca.tar.bz2
opensim-SC_OLD-5f18f2ce6a4308fe30de8b7816058bd5d4b962ca.tar.xz
More EntityTransferContext plumbing
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index bb47e6b..0ebd37e 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Services.Connectors.Simulation
121 121
122 try 122 try
123 { 123 {
124 OSDMap args = aCircuit.PackAgentCircuitData(-1); 124 OSDMap args = aCircuit.PackAgentCircuitData(ctx);
125 PackData(args, source, aCircuit, destination, flags); 125 PackData(args, source, aCircuit, destination, flags);
126 126
127 OSDMap result = WebUtil.PostToServiceCompressed(uri, args, 30000); 127 OSDMap result = WebUtil.PostToServiceCompressed(uri, args, 30000);
@@ -260,7 +260,7 @@ namespace OpenSim.Services.Connectors.Simulation
260 260
261 try 261 try
262 { 262 {
263 OSDMap args = cAgentData.Pack(); 263 OSDMap args = cAgentData.Pack(ctx);
264 264
265 args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString()); 265 args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString());
266 args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString()); 266 args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString());
@@ -347,8 +347,6 @@ namespace OpenSim.Services.Connectors.Simulation
347 ctx.OutboundVersion = float.Parse(parts[1]); 347 ctx.OutboundVersion = float.Parse(parts[1]);
348 } 348 }
349 } 349 }
350 if (data.ContainsKey("variable_wearables_count_supported"))
351 ctx.VariableWearablesSupported = true;
352 350
353 m_log.DebugFormat( 351 m_log.DebugFormat(
354 "[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1}, reason {2}, version {3}/{4}", 352 "[REMOTE SIMULATION CONNECTOR]: QueryAccess to {0} returned {1}, reason {2}, version {3}/{4}",