send agent view range to new child agents

4 files changed, 12 insertions, 1 deletions

diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 5a9eeb5..330a41e 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -173,6 +173,7 @@ namespace OpenSim.Framework
         /// Position the Agent's Avatar starts in the region
         /// </summary>
         public Vector3 startpos;
+        public float startfar = -1.0f;
 
         public Dictionary<string, object> ServiceURLs;
 
@@ -219,6 +220,8 @@ namespace OpenSim.Framework
             args["channel"] = OSD.FromString(Channel);
             args["mac"] = OSD.FromString(Mac);
             args["id0"] = OSD.FromString(Id0);
+            if(startfar > 0)
+                args["far"] = OSD.FromReal(startfar);
 
             if (Appearance != null)
             {
@@ -327,6 +330,9 @@ namespace OpenSim.Framework
             if (args["start_pos"] != null)
                 Vector3.TryParse(args["start_pos"].AsString(), out startpos);
 
+            if(args["far"] != null)
+                startfar = (float)args["far"].AsReal();
+
             //m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos);
 
             try
diff --git a/OpenSim/Framework/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs
index b6e48b4..2cd11ff 100644
--- a/OpenSim/Framework/AgentCircuitManager.cs
+++ b/OpenSim/Framework/AgentCircuitManager.cs
@@ -79,6 +79,7 @@ namespace OpenSim.Framework
                 user.LoginInfo.InventoryFolder = validcircuit.InventoryFolder;
                 user.LoginInfo.BaseFolder = validcircuit.BaseFolder;
                 user.LoginInfo.StartPos = validcircuit.startpos;
+                user.LoginInfo.StartFar = (float)validcircuit.startfar;
             }
             else
             {
@@ -175,7 +176,8 @@ namespace OpenSim.Framework
                 {
                     m_agentCircuits[(uint) agentData.circuitcode].firstname = agentData.firstname;
                     m_agentCircuits[(uint) agentData.circuitcode].lastname = agentData.lastname;
-                    m_agentCircuits[(uint) agentData.circuitcode].startpos = agentData.startpos;
+                    m_agentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos;
+                    m_agentCircuits[(uint)agentData.circuitcode].startfar = agentData.startfar;
 
                     // Updated for when we don't know them before calling Scene.NewUserConnection
                     m_agentCircuits[(uint) agentData.circuitcode].SecureSessionID = agentData.SecureSessionID;
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 8b1a982..b395f39 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -707,6 +707,7 @@ namespace OpenSim.Framework
     public interface IClientAPI
     {
         Vector3 StartPos { get; set; }
+        float StartFar { get; set; }
 
         UUID AgentId { get; }
 
diff --git a/OpenSim/Framework/Login.cs b/OpenSim/Framework/Login.cs
index 54a6654..b8a24ea 100644
--- a/OpenSim/Framework/Login.cs
+++ b/OpenSim/Framework/Login.cs
@@ -42,11 +42,13 @@ namespace OpenSim.Framework
         public UUID SecureSession = UUID.Zero;
         public UUID Session;
         public Vector3 StartPos;
+        public float StartFar;
         public AvatarAppearance Appearance;
 
         public Login()
         {
             StartPos = new Vector3(128, 128, 70);
+            StartFar = -1;
         }
     }
 }