3 files changed, 87 insertions, 48 deletions
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index 48db634..261b96b 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -91,106 +91,106 @@
    <Compile Include="AgentInventory.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="AuthenticateSessionBase.cs">
+    <Compile Include="Util.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="BlockingQueue.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="IRegionCommsListener.cs">
+    <Compile Include="AuthenticateSessionBase.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Logger.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LoginService.cs">
+    <Compile Include="Remoting.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="RegionCommsListener.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Remoting.cs">
+    <Compile Include="LoginService.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="SimProfile.cs">
+    <Compile Include="BlockingQueue.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="UserProfile.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Util.cs">
+    <Compile Include="IRegionCommsListener.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SimProfile.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Interfaces\AuthenticateResponse.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Interfaces\IAssetServer.cs">
+    <Compile Include="Interfaces\IUserServer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Interfaces\IClientAPI.cs">
+    <Compile Include="Interfaces\IAssetServer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Interfaces\ILocalStorage.cs">
+    <Compile Include="Interfaces\IWorld.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Interfaces\IUserServer.cs">
+    <Compile Include="Interfaces\IClientAPI.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Interfaces\IWorld.cs">
+    <Compile Include="Interfaces\ILocalStorage.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Interfaces\Config\IGenericConfig.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Interfaces\Config\IGridConfig.cs">
+    <Compile Include="Interfaces\Config\IUserConfig.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Interfaces\Config\IUserConfig.cs">
+    <Compile Include="Interfaces\Config\IGridConfig.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\AgentCiruitData.cs">
+    <Compile Include="Types\NeighbourInfo.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\AgentWearable.cs">
+    <Compile Include="Types\RegionHandle.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\AssetBase.cs">
+    <Compile Include="Types\RegionInfo.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\AssetLandmark.cs">
+    <Compile Include="Types\ParcelData.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\AssetStorage.cs">
+    <Compile Include="Types\AgentWearable.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\EstateSettings.cs">
+    <Compile Include="Types\PrimData.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\Login.cs">
+    <Compile Include="Types\MapBlockData.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\MapBlockData.cs">
+    <Compile Include="Types\AssetStorage.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\NeighbourInfo.cs">
+    <Compile Include="Types\EstateSettings.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\NetworkServersInfo.cs">
+    <Compile Include="Types\AgentCiruitData.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\ParcelData.cs">
+    <Compile Include="Types\Login.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\PrimData.cs">
+    <Compile Include="Types\AssetLandmark.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\RegionHandle.cs">
+    <Compile Include="Types\AssetBase.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Types\RegionInfo.cs">
+    <Compile Include="Types\NetworkServersInfo.cs">
      <SubType>Code</SubType>
    </Compile>
  </ItemGroup>
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index a18838b..f05217f 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -12,40 +12,40 @@
            </resources>
            <sources failonempty="true">
                <include name="AgentInventory.cs" />
+                <include name="Util.cs" />
                <include name="AuthenticateSessionBase.cs" />
-                <include name="BlockingQueue.cs" />
-                <include name="IRegionCommsListener.cs" />
                <include name="Logger.cs" />
-                <include name="LoginService.cs" />
-                <include name="RegionCommsListener.cs" />
                <include name="Remoting.cs" />
-                <include name="SimProfile.cs" />
+                <include name="RegionCommsListener.cs" />
+                <include name="LoginService.cs" />
+                <include name="BlockingQueue.cs" />
                <include name="UserProfile.cs" />
-                <include name="Util.cs" />
+                <include name="IRegionCommsListener.cs" />
+                <include name="SimProfile.cs" />
                <include name="Interfaces/AuthenticateResponse.cs" />
+                <include name="Interfaces/IUserServer.cs" />
                <include name="Interfaces/IAssetServer.cs" />
+                <include name="Interfaces/IWorld.cs" />
                <include name="Interfaces/IClientAPI.cs" />
                <include name="Interfaces/ILocalStorage.cs" />
-                <include name="Interfaces/IUserServer.cs" />
-                <include name="Interfaces/IWorld.cs" />
                <include name="Interfaces/Config/IGenericConfig.cs" />
-                <include name="Interfaces/Config/IGridConfig.cs" />
                <include name="Interfaces/Config/IUserConfig.cs" />
+                <include name="Interfaces/Config/IGridConfig.cs" />
                <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/AgentCiruitData.cs" />
+                <include name="Types/NeighbourInfo.cs" />
+                <include name="Types/RegionHandle.cs" />
+                <include name="Types/RegionInfo.cs" />
+                <include name="Types/ParcelData.cs" />
                <include name="Types/AgentWearable.cs" />
-                <include name="Types/AssetBase.cs" />
+                <include name="Types/PrimData.cs" />
-                <include name="Types/AssetLandmark.cs" />
+                <include name="Types/MapBlockData.cs" />
                <include name="Types/AssetStorage.cs" />
                <include name="Types/EstateSettings.cs" />
+                <include name="Types/AgentCiruitData.cs" />
                <include name="Types/Login.cs" />
-                <include name="Types/MapBlockData.cs" />
+                <include name="Types/AssetLandmark.cs" />
-                <include name="Types/NeighbourInfo.cs" />
+                <include name="Types/AssetBase.cs" />
                <include name="Types/NetworkServersInfo.cs" />
-                <include name="Types/ParcelData.cs" />
-                <include name="Types/PrimData.cs" />
-                <include name="Types/RegionHandle.cs" />
-                <include name="Types/RegionInfo.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index 73d7811..c6b81a7 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -156,6 +156,45 @@ namespace OpenSim.Framework.Types
                        this.GridRecvKey = attri;
                    }
+                    //Grid Server 
+                    attri = "";
+                    attri = configData.GetAttribute("UserServerURL");
+                    if (attri == "")
+                    {
+                        this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");
+                        configData.SetAttribute("UserServerURL", this.UserURL);
+                    }
+                    else
+                    {
+                        this.UserURL = attri;
+                    }
+                    //Grid Send Key
+                    attri = "";
+                    attri = configData.GetAttribute("UserSendKey");
+                    if (attri == "")
+                    {
+                        this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null");
+                        configData.SetAttribute("UserSendKey", this.UserSendKey);
+                    }
+                    else
+                    {
+                        this.UserSendKey = attri;
+                    }
+                    //Grid Receive Key
+                    attri = "";
+                    attri = configData.GetAttribute("UserRecvKey");
+                    if (attri == "")
+                    {
+                        this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null");
+                        configData.SetAttribute("GridRecvKey", this.UserRecvKey);
+                    }
+                    else
+                    {
+                        this.UserRecvKey = attri;
+                    }
                    attri = "";
                    attri = configData.GetAttribute("AssetServerURL");
                    if (attri == "")