From 9d6c996570377f137f93d16c388746f949b9a841 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 11 Sep 2019 13:51:43 +0100
Subject: extent supported number of avatar textures/bakes/wearables, tell
 viewers about it on lludp RegionHandShake; propagate agenthover; block
 teleports/crossings based on worn wearables and peer version;

---
 .../Services/Connectors/Simulation/SimulationServiceConnector.cs    | 2 ++
 OpenSim/Services/Interfaces/IAgentPreferencesService.cs             | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index f5e7771..18c949e 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -116,6 +116,8 @@ namespace OpenSim.Services.Connectors.Simulation
             try
             {
                 OSDMap args = aCircuit.PackAgentCircuitData(ctx);
+                if(ctx == null)
+                    ctx = new EntityTransferContext();
                 args["context"] = ctx.Pack();
                 PackData(args, source, aCircuit, destination, flags);
 
diff --git a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs
index af92326..6d2ce8f 100644
--- a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs
+++ b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Services.Interfaces
             if (kvp.ContainsKey("AccessPrefs"))
                 AccessPrefs = kvp["AccessPrefs"];
             if (kvp.ContainsKey("HoverHeight"))
-                HoverHeight = double.Parse(kvp["HoverHeight"]);
+                HoverHeight = float.Parse(kvp["HoverHeight"]);
             if (kvp.ContainsKey("Language"))
                 Language = kvp["Language"];
             if (kvp.ContainsKey("LanguageIsPublic"))
@@ -65,7 +65,7 @@ namespace OpenSim.Services.Interfaces
             if (kvp.ContainsKey("AccessPrefs"))
                 AccessPrefs = kvp["AccessPrefs"].ToString();
             if (kvp.ContainsKey("HoverHeight"))
-                HoverHeight = double.Parse(kvp["HoverHeight"].ToString());
+                HoverHeight = float.Parse(kvp["HoverHeight"].ToString());
             if (kvp.ContainsKey("Language"))
                 Language = kvp["Language"].ToString();
             if (kvp.ContainsKey("LanguageIsPublic"))
@@ -95,7 +95,7 @@ namespace OpenSim.Services.Interfaces
         public UUID PrincipalID = UUID.Zero;
         public string AccessPrefs = "M";
         //public int GodLevel; // *TODO: Implement GodLevel (Unused by the viewer, afaict - 6/11/2015)
-        public double HoverHeight = 0.0;
+        public float HoverHeight = 0.0f;
         public string Language = "en-us";
         public bool LanguageIsPublic = true;
         // DefaultObjectPermMasks
-- 
cgit v1.1