merged new OpenSim from branches/ogs-cs

2 files changed, 9 insertions, 2 deletions

diff --git a/src/LocalServers/LocalGridServers/AssemblyInfo.cs b/src/LocalServers/LocalGridServers/AssemblyInfo.cs
index e25895f..943f5e7 100644
--- a/src/LocalServers/LocalGridServers/AssemblyInfo.cs
+++ b/src/LocalServers/LocalGridServers/AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
 
 [assembly: ComVisibleAttribute(false)]
 [assembly: CLSCompliantAttribute(false)]
-[assembly: AssemblyVersionAttribute("0.1.*.192")]
+[assembly: AssemblyVersionAttribute("0.1.*.193206")]
 [assembly: AssemblyTitleAttribute("opensim-localservers")]
 [assembly: AssemblyDescriptionAttribute("local grid servers")]
 [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/LocalServers/LocalGridServers/LocalGrid.cs b/src/LocalServers/LocalGridServers/LocalGrid.cs
index 5adce27..86a68d5 100644
--- a/src/LocalServers/LocalGridServers/LocalGrid.cs
+++ b/src/LocalServers/LocalGridServers/LocalGrid.cs
@@ -113,7 +113,14 @@ namespace LocalGridServers
         public class LocalGridServer :IGridServer

         {

                 public List<Login> Sessions = new List<Login>();  

-                

+        

+                private Dictionary<uint, agentcircuitdata> AgentCircuits = new Dictionary<uint, agentcircuitdata>();

+

+                public Dictionary<uint, agentcircuitdata> agentcircuits {

+                        get {return agentcircuits;}

+                        set {agentcircuits=value;}

+                }

+        

                 public LocalGridServer()

                 {

                         Sessions = new List<Login>();