diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/AgentCircuitData.cs | 5 | ||||
-rw-r--r-- | OpenSim/Framework/IScene.cs | 3 | ||||
-rw-r--r-- | OpenSim/Framework/Util.cs | 2 |
3 files changed, 9 insertions, 1 deletions
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 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
29 | using OpenMetaverse; | 30 | using OpenMetaverse; |
30 | 31 | ||
31 | namespace OpenSim.Framework | 32 | namespace OpenSim.Framework |
@@ -35,6 +36,7 @@ namespace OpenSim.Framework | |||
35 | public UUID AgentID; | 36 | public UUID AgentID; |
36 | public UUID BaseFolder; | 37 | public UUID BaseFolder; |
37 | public string CapsPath = String.Empty; | 38 | public string CapsPath = String.Empty; |
39 | public Dictionary<ulong, string> ChildrenCapSeeds; | ||
38 | public bool child; | 40 | public bool child; |
39 | public uint circuitcode; | 41 | public uint circuitcode; |
40 | public string firstname; | 42 | public string firstname; |
@@ -61,6 +63,7 @@ namespace OpenSim.Framework | |||
61 | InventoryFolder = new UUID(cAgent.InventoryFolder); | 63 | InventoryFolder = new UUID(cAgent.InventoryFolder); |
62 | BaseFolder = new UUID(cAgent.BaseFolder); | 64 | BaseFolder = new UUID(cAgent.BaseFolder); |
63 | CapsPath = cAgent.CapsPath; | 65 | CapsPath = cAgent.CapsPath; |
66 | ChildrenCapSeeds = cAgent.ChildrenCapSeeds; | ||
64 | } | 67 | } |
65 | } | 68 | } |
66 | 69 | ||
@@ -70,6 +73,7 @@ namespace OpenSim.Framework | |||
70 | public Guid AgentID; | 73 | public Guid AgentID; |
71 | public Guid BaseFolder; | 74 | public Guid BaseFolder; |
72 | public string CapsPath = String.Empty; | 75 | public string CapsPath = String.Empty; |
76 | public Dictionary<ulong, string> ChildrenCapSeeds; | ||
73 | public bool child; | 77 | public bool child; |
74 | public uint circuitcode; | 78 | public uint circuitcode; |
75 | public string firstname; | 79 | public string firstname; |
@@ -100,6 +104,7 @@ namespace OpenSim.Framework | |||
100 | InventoryFolder = cAgent.InventoryFolder.Guid; | 104 | InventoryFolder = cAgent.InventoryFolder.Guid; |
101 | BaseFolder = cAgent.BaseFolder.Guid; | 105 | BaseFolder = cAgent.BaseFolder.Guid; |
102 | CapsPath = cAgent.CapsPath; | 106 | CapsPath = cAgent.CapsPath; |
107 | ChildrenCapSeeds = cAgent.ChildrenCapSeeds; | ||
103 | } | 108 | } |
104 | } | 109 | } |
105 | } | 110 | } |
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 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | ||
28 | using OpenMetaverse; | 29 | using OpenMetaverse; |
29 | 30 | ||
30 | namespace OpenSim.Framework | 31 | namespace OpenSim.Framework |
@@ -73,7 +74,9 @@ namespace OpenSim.Framework | |||
73 | 74 | ||
74 | bool PresenceChildStatus(UUID avatarID); | 75 | bool PresenceChildStatus(UUID avatarID); |
75 | 76 | ||
77 | // Diva: get this out of here!!! | ||
76 | string GetCapsPath(UUID agentId); | 78 | string GetCapsPath(UUID agentId); |
79 | Dictionary<ulong, string> GetChildrenSeeds(UUID agentId); | ||
77 | 80 | ||
78 | T RequestModuleInterface<T>(); | 81 | T RequestModuleInterface<T>(); |
79 | T[] RequestModuleInterfaces<T>(); | 82 | 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 | |||
350 | public static bool IsOutsideView(uint oldx, uint newx, uint oldy, uint newy) | 350 | public static bool IsOutsideView(uint oldx, uint newx, uint oldy, uint newy) |
351 | { | 351 | { |
352 | // Eventually this will be a function of the draw distance / camera position too. | 352 | // Eventually this will be a function of the draw distance / camera position too. |
353 | return ((Math.Abs((int)(oldx - newx)) > 1) || (Math.Abs((int)(oldy - newy)) > 1)); | 353 | return (((int)Math.Abs((int)(oldx - newx)) > 1) || ((int)Math.Abs((int)(oldy - newy)) > 1)); |
354 | } | 354 | } |
355 | 355 | ||
356 | public static string FieldToString(byte[] bytes) | 356 | public static string FieldToString(byte[] bytes) |