*Master User is now set up

*Added support for getting user profile information from remote grid server (untested)
*Updated prebuild.xml

3 files changed, 6 insertions, 5 deletions

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 74d12d2..69b5da6 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -43,9 +43,10 @@ namespace OpenSim.Framework.Communications
         public IGridServices GridServer;

         public IInterRegionCommunications InterRegion;

 

+        public NetworkServersInfo ServersInfo;

         public CommunicationsManager(NetworkServersInfo serversInfo)

         {

-            

+            ServersInfo = serversInfo;

         }

     }

 }

diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
index 31ab172..66507a8 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
@@ -86,9 +86,6 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="CommunicationsManager.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="IGridServices.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -98,6 +95,9 @@
     <Compile Include="IUserServices.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="CommunicationsManager.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
index 52d29f6..1c55d8c 100644
--- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
+++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
@@ -11,10 +11,10 @@
             <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="CommunicationsManager.cs" />

                 <include name="IGridServices.cs" />

                 <include name="IInterRegionCommunications.cs" />

                 <include name="IUserServices.cs" />

+                <include name="CommunicationsManager.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">