From e6eb571c1d19972fe7eb4c3f7de113b1b91f5e02 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Sun, 14 Dec 2008 02:17:12 +0000
Subject: Mantis#2725. Thank you kindly, Diva, for a patch that: Adds missing
 protocol pieces for EstablishAgentCommunication event which allows the client
 to activate CAPS and the EQ for child agents.

---
 OpenSim/Framework/AgentCircuitData.cs | 5 +++++
 OpenSim/Framework/IScene.cs           | 3 +++
 OpenSim/Framework/Util.cs             | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 045bd00..2671e87 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
@@ -35,6 +36,7 @@ namespace OpenSim.Framework
         public UUID AgentID;
         public UUID BaseFolder;
         public string CapsPath = String.Empty;
+        public Dictionary<ulong, string> ChildrenCapSeeds;
         public bool child;
         public uint circuitcode;
         public string firstname;
@@ -61,6 +63,7 @@ namespace OpenSim.Framework
             InventoryFolder = new UUID(cAgent.InventoryFolder);
             BaseFolder = new UUID(cAgent.BaseFolder);
             CapsPath = cAgent.CapsPath;
+            ChildrenCapSeeds = cAgent.ChildrenCapSeeds;
         }
     }
 
@@ -70,6 +73,7 @@ namespace OpenSim.Framework
         public Guid AgentID;
         public Guid BaseFolder;
         public string CapsPath = String.Empty;
+        public Dictionary<ulong, string> ChildrenCapSeeds;
         public bool child;
         public uint circuitcode;
         public string firstname;
@@ -100,6 +104,7 @@ namespace OpenSim.Framework
             InventoryFolder = cAgent.InventoryFolder.Guid;
             BaseFolder = cAgent.BaseFolder.Guid;
             CapsPath = cAgent.CapsPath;
+            ChildrenCapSeeds = cAgent.ChildrenCapSeeds;
         }
     }
 }
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index bd4acd1..63bf7ac 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System.Collections.Generic;
 using OpenMetaverse;
 
 namespace OpenSim.Framework
@@ -73,7 +74,9 @@ namespace OpenSim.Framework
 
         bool PresenceChildStatus(UUID avatarID);
 
+        // Diva: get this out of here!!!
         string GetCapsPath(UUID agentId);
+        Dictionary<ulong, string> GetChildrenSeeds(UUID agentId);
 
         T RequestModuleInterface<T>();
         T[] RequestModuleInterfaces<T>();
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 23bdb94..4cc7134 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -350,7 +350,7 @@ namespace OpenSim.Framework
         public static bool IsOutsideView(uint oldx, uint newx, uint oldy, uint newy)
         {
             // Eventually this will be a function of the draw distance / camera position too.
-            return ((Math.Abs((int)(oldx - newx)) > 1) || (Math.Abs((int)(oldy - newy)) > 1));
+            return (((int)Math.Abs((int)(oldx - newx)) > 1) || ((int)Math.Abs((int)(oldy - newy)) > 1));
         }
 
         public static string FieldToString(byte[] bytes)
-- 
cgit v1.1