7 files changed, 80 insertions, 110 deletions

diff --git a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
index fb7dc7d..795f99d 100644
--- a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
+++ b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs
@@ -35,21 +35,19 @@ using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;

 using OpenGrid.Framework.Communications;

 

-using OpenSim.LocalCommunications.LocalUserManagement;

 

 namespace OpenSim.LocalCommunications

 {

     public class CommunicationsLocal : CommunicationsManager

     {

-        public LocalBackEndServices SandBoxManager = new LocalBackEndServices();

-        public LocalUserServices UserServices = new LocalUserServices();

+        public LocalBackEndServices SandBoxServices = new LocalBackEndServices();

+        protected LocalUserServices UserServices = new LocalUserServices();

     

         public CommunicationsLocal()

         {

-

             UserServer = UserServices;

-            GridServer = SandBoxManager;

-            InterRegion = SandBoxManager;

+            GridServer = SandBoxServices;

+            InterRegion = SandBoxServices;

         }

     }

 }

diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs
deleted file mode 100644
index f438117..0000000
--- a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-using OpenGrid.Framework.Communications;

-using OpenSim.Framework.User;

-

-using libsecondlife;

-

-namespace OpenSim.LocalCommunications.LocalUserManagement

-{

-    public class LocalUserServices : IUserServices

-    {

-        public UserProfileManager userProfileManager = new UserProfileManager();

-        public LocalLoginService localLoginService;

-        public LocalUserServices()

-        {

-            localLoginService  = new LocalLoginService(this);

-        }

-

-        public UserProfile GetUserProfile(string first_name, string last_name)

-        {

-            return GetUserProfile(first_name + " " + last_name);

-        }

-

-        public UserProfile GetUserProfile(string name)

-        {

-            return null;

-        }

-        public UserProfile GetUserProfile(LLUUID avatar_id)

-        {

-            return null;

-        }

-

-    }

-}

diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs
deleted file mode 100644
index 5f9d028..0000000
--- a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-using libsecondlife;

-using OpenSim.Framework.User;

-

-namespace OpenSim.LocalCommunications.LocalUserManagement

-{

-    public class UserProfileManager

-    {

-        Dictionary<LLUUID, UserProfile> userProfiles = new Dictionary<LLUUID, UserProfile>();

-

-        public UserProfileManager()

-        {

-        }

-

-        private LLUUID getUserUUID(string first_name, string last_name)

-        {

-            return getUserUUID(first_name + " " + last_name);

-        }

-        private LLUUID getUserUUID(string name)

-        {

-            return null;

-        }

-

-

-        public UserProfile getUserProfile(string first_name, string last_name)

-        {

-            return getUserProfile(first_name + " " + last_name);

-        }

-        public UserProfile getUserProfile(string name)

-        {

-            return null;

-        }

-        public UserProfile getUserProfile(LLUUID user_id)

-        {

-            return null;

-        }

-

-    }

-}

diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
new file mode 100644
index 0000000..0fe52a7
--- /dev/null
+++ b/OpenSim/OpenSim.LocalCommunications/LocalUserServices.cs
@@ -0,0 +1,43 @@
+using System;

+using System.Collections;

+using System.Collections.Generic;

+using System.Text;

+

+using OpenGrid.Framework.Communications;

+using OpenSim.Framework.User;

+using OpenGrid.Framework.UserManagement;

+using OpenGrid.Framework.Data;

+

+using libsecondlife;

+

+namespace OpenSim.LocalCommunications

+{

+    public class LocalUserServices : UserManagerBase, IUserServices

+    {

+       

+        public LocalUserServices()

+        {

+

+        }

+

+        public UserProfileData GetUserProfile(string first_name, string last_name)

+        {

+            return GetUserProfile(first_name + " " + last_name);

+        }

+

+        public UserProfileData GetUserProfile(string name)

+        {

+            return null;

+        }

+        public UserProfileData GetUserProfile(LLUUID avatar_id)

+        {

+            return null;

+        }

+

+        public override void CustomiseResponse(ref Hashtable response, ref UserProfileData theUser)

+        {

+

+        }

+

+    }

+}

diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
index f7c28eb..3cb36da 100644
--- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
+++ b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,8 +6,7 @@
     <ProjectGuid>{79CED992-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

+    <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.LocalCommunications</AssemblyName>

@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>OpenSim.LocalCommunications</RootNamespace>

-    <StartupObject>

-    </StartupObject>

+    <StartupObject></StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -31,8 +28,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -41,8 +37,7 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -51,8 +46,7 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile>

-    </DocumentationFile>

+    <DocumentationFile></DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -61,20 +55,18 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="libsecondlife.dll">

+    <Reference Include="libsecondlife.dll" >

       <HintPath>..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System">

+    <Reference Include="System" >

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Data" />

-    <Reference Include="System.Xml">

+    <Reference Include="System.Xml" >

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -84,13 +76,25 @@
       <Name>OpenGrid.Framework.Communications</Name>

       <Project>{683344D5-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

+    </ProjectReference>

+    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">

+      <Name>OpenGrid.Framework.Data</Name>

+      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

+    </ProjectReference>

+    <ProjectReference Include="..\..\Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj">

+      <Name>OpenGrid.Framework.UserManagement</Name>

+      <Project>{DA9A7391-0000-0000-0000-000000000000}</Project>

+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">

       <Name>OpenSim.Framework</Name>

       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-      <Private>False</Private>

+                        <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -100,9 +104,9 @@
     <Compile Include="LocalBackEndServices.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LocalUserManagement\LocalLoginService.cs" />

-    <Compile Include="LocalUserManagement\LocalUserServices.cs" />

-    <Compile Include="LocalUserManagement\UserProfileManager.cs" />

+    <Compile Include="LocalUserServices.cs">

+      <SubType>Code</SubType>

+    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

@@ -114,4 +118,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user
index 518ce40..5941547 100644
--- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user
+++ b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user
@@ -2,7 +2,7 @@
   <PropertyGroup>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ReferencePath>C:\Documents and Settings\Stefan\My Documents\source\opensim\branches\Sugilite\bin\</ReferencePath>

+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\</ReferencePath>

     <LastOpenVersion>8.0.50727</LastOpenVersion>

     <ProjectView>ProjectFiles</ProjectView>

     <ProjectTrust>0</ProjectTrust>

diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build
index 2ea6497..2b72e2d 100644
--- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build
+++ b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.dll.build
@@ -13,6 +13,7 @@
             <sources failonempty="true">

                 <include name="CommunicationsLocal.cs" />

                 <include name="LocalBackEndServices.cs" />

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

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

             </sources>

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

@@ -22,6 +23,8 @@
                 </lib>

                 <include name="../../bin/libsecondlife.dll" />

                 <include name="../../bin/OpenGrid.Framework.Communications.dll" />

+                <include name="../../bin/OpenGrid.Framework.Data.dll" />

+                <include name="../../bin/OpenGrid.Framework.UserManagement.dll" />

                 <include name="../../bin/OpenSim.Framework.dll" />

                 <include name="System.dll" />

                 <include name="System.Xml.dll" />