aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index b399a58..4962629 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -292,7 +292,7 @@ namespace OpenSim.Framework
292 public Vector3 AtAxis; 292 public Vector3 AtAxis;
293 public Vector3 LeftAxis; 293 public Vector3 LeftAxis;
294 public Vector3 UpAxis; 294 public Vector3 UpAxis;
295 public bool ChangedGrid; 295 public bool SenderWantsToWaitForRoot;
296 296
297 public float Far; 297 public float Far;
298 public float Aspect; 298 public float Aspect;
@@ -363,8 +363,9 @@ namespace OpenSim.Framework
363 args["left_axis"] = OSD.FromString(LeftAxis.ToString()); 363 args["left_axis"] = OSD.FromString(LeftAxis.ToString());
364 args["up_axis"] = OSD.FromString(UpAxis.ToString()); 364 args["up_axis"] = OSD.FromString(UpAxis.ToString());
365 365
366 366 //backwards compatibility
367 args["changed_grid"] = OSD.FromBoolean(ChangedGrid); 367 args["changed_grid"] = OSD.FromBoolean(SenderWantsToWaitForRoot);
368 args["wait_for_root"] = OSD.FromBoolean(SenderWantsToWaitForRoot);
368 args["far"] = OSD.FromReal(Far); 369 args["far"] = OSD.FromReal(Far);
369 args["aspect"] = OSD.FromReal(Aspect); 370 args["aspect"] = OSD.FromReal(Aspect);
370 371
@@ -537,8 +538,8 @@ namespace OpenSim.Framework
537 if (args["up_axis"] != null) 538 if (args["up_axis"] != null)
538 Vector3.TryParse(args["up_axis"].AsString(), out AtAxis); 539 Vector3.TryParse(args["up_axis"].AsString(), out AtAxis);
539 540
540 if (args["changed_grid"] != null) 541 if (args.ContainsKey("wait_for_root") && args["wait_for_root"] != null)
541 ChangedGrid = args["changed_grid"].AsBoolean(); 542 SenderWantsToWaitForRoot = args["wait_for_root"].AsBoolean();
542 543
543 if (args["far"] != null) 544 if (args["far"] != null)
544 Far = (float)(args["far"].AsReal()); 545 Far = (float)(args["far"].AsReal());