aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie Thielker2015-11-02 00:23:38 +0100
committerMelanie Thielker2015-11-02 00:23:38 +0100
commitf88e4a1ec914ddaa9680a62faf96241b87fd0e06 (patch)
tree5c58976397d044bf9d18e78409bb846139f13016 /OpenSim/Services
parentMerge branch 'avinationmerge' of opensimulator.org:/var/git/opensim into avin... (diff)
downloadopensim-SC-f88e4a1ec914ddaa9680a62faf96241b87fd0e06.zip
opensim-SC-f88e4a1ec914ddaa9680a62faf96241b87fd0e06.tar.gz
opensim-SC-f88e4a1ec914ddaa9680a62faf96241b87fd0e06.tar.bz2
opensim-SC-f88e4a1ec914ddaa9680a62faf96241b87fd0e06.tar.xz
Plumb the rest of the context stuff. Well, what I see so far anyway
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 0ebd37e..1302a22 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -122,6 +122,7 @@ namespace OpenSim.Services.Connectors.Simulation
122 try 122 try
123 { 123 {
124 OSDMap args = aCircuit.PackAgentCircuitData(ctx); 124 OSDMap args = aCircuit.PackAgentCircuitData(ctx);
125 args["context"] = ctx.Pack();
125 PackData(args, source, aCircuit, destination, flags); 126 PackData(args, source, aCircuit, destination, flags);
126 127
127 OSDMap result = WebUtil.PostToServiceCompressed(uri, args, 30000); 128 OSDMap result = WebUtil.PostToServiceCompressed(uri, args, 30000);
@@ -266,6 +267,7 @@ namespace OpenSim.Services.Connectors.Simulation
266 args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString()); 267 args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString());
267 args["destination_name"] = OSD.FromString(destination.RegionName); 268 args["destination_name"] = OSD.FromString(destination.RegionName);
268 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); 269 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
270 args["context"] = ctx.Pack();
269 271
270 OSDMap result = WebUtil.PutToServiceCompressed(uri, args, timeout); 272 OSDMap result = WebUtil.PutToServiceCompressed(uri, args, timeout);
271 if (result["Success"].AsBoolean()) 273 if (result["Success"].AsBoolean())
@@ -308,6 +310,8 @@ namespace OpenSim.Services.Connectors.Simulation
308 request.Add("simulation_service_accepted_min", OSD.FromReal(VersionInfo.SimulationServiceVersionAcceptedMin)); 310 request.Add("simulation_service_accepted_min", OSD.FromReal(VersionInfo.SimulationServiceVersionAcceptedMin));
309 request.Add("simulation_service_accepted_max", OSD.FromReal(VersionInfo.SimulationServiceVersionAcceptedMax)); 311 request.Add("simulation_service_accepted_max", OSD.FromReal(VersionInfo.SimulationServiceVersionAcceptedMax));
310 312
313 request.Add("context", ctx.Pack());
314
311 OSDArray features = new OSDArray(); 315 OSDArray features = new OSDArray();
312 foreach (UUID feature in featuresAvailable) 316 foreach (UUID feature in featuresAvailable)
313 features.Add(OSD.FromString(feature.ToString())); 317 features.Add(OSD.FromString(feature.ToString()));