diff options
author | mingchen | 2007-06-18 20:10:19 +0000 |
---|---|---|
committer | mingchen | 2007-06-18 20:10:19 +0000 |
commit | 56c4a3df5b9a13333fbe15160e9b7383a98e3675 (patch) | |
tree | 7df9c5c4e41bb9c1751f23627ab1d74dadf6b6a0 /OpenSim | |
parent | * example soft logger by delegate (diff) | |
download | opensim-SC_OLD-56c4a3df5b9a13333fbe15160e9b7383a98e3675.zip opensim-SC_OLD-56c4a3df5b9a13333fbe15160e9b7383a98e3675.tar.gz opensim-SC_OLD-56c4a3df5b9a13333fbe15160e9b7383a98e3675.tar.bz2 opensim-SC_OLD-56c4a3df5b9a13333fbe15160e9b7383a98e3675.tar.xz |
*Updated/Added the base classes and interfaces for user and login servers
*Not yet usable, but I'm working on it
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs | 12 | ||||
-rw-r--r-- | OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj | 39 |
2 files changed, 35 insertions, 16 deletions
diff --git a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs index 9b811ae..e42e414 100644 --- a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs +++ b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs | |||
@@ -35,15 +35,23 @@ using OpenSim.Framework.Interfaces; | |||
35 | using OpenSim.Framework.Types; | 35 | using OpenSim.Framework.Types; |
36 | using OpenGrid.Framework.Communications; | 36 | using OpenGrid.Framework.Communications; |
37 | 37 | ||
38 | using OpenSim.LocalCommunications.LocalLoginManagement; | ||
39 | using OpenSim.LocalCommunications.LocalUserManagement; | ||
40 | |||
38 | namespace OpenSim.LocalCommunications | 41 | namespace OpenSim.LocalCommunications |
39 | { | 42 | { |
40 | public class CommunicationsLocal : CommunicationsManager | 43 | public class CommunicationsLocal : CommunicationsManager |
41 | { | 44 | { |
42 | public LocalBackEndServices SandBoxManager = new LocalBackEndServices(); | 45 | public LocalBackEndServices SandBoxManager = new LocalBackEndServices(); |
43 | 46 | public LocalUserServices UserServices = new LocalUserServices(); | |
47 | public LocalLoginService LoginService; | ||
48 | |||
44 | public CommunicationsLocal() | 49 | public CommunicationsLocal() |
45 | { | 50 | { |
46 | UserServer = null; | 51 | LoginService = new LocalLoginService(this.UserServices); |
52 | |||
53 | UserServer = UserServices; | ||
54 | LoginServer = LoginService; | ||
47 | GridServer = SandBoxManager; | 55 | GridServer = SandBoxManager; |
48 | InterRegion = SandBoxManager; | 56 | InterRegion = SandBoxManager; |
49 | } | 57 | } |
diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj index 95c9f98..af5d2d3 100644 --- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj +++ b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj | |||
@@ -1,4 +1,4 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
@@ -6,7 +6,8 @@ | |||
6 | <ProjectGuid>{79CED992-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{79CED992-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon></ApplicationIcon> | 9 | <ApplicationIcon> |
10 | </ApplicationIcon> | ||
10 | <AssemblyKeyContainerName> | 11 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 12 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenSim.LocalCommunications</AssemblyName> | 13 | <AssemblyName>OpenSim.LocalCommunications</AssemblyName> |
@@ -15,9 +16,11 @@ | |||
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 17 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 18 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 19 | <AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
19 | <RootNamespace>OpenSim.LocalCommunications</RootNamespace> | 21 | <RootNamespace>OpenSim.LocalCommunications</RootNamespace> |
20 | <StartupObject></StartupObject> | 22 | <StartupObject> |
23 | </StartupObject> | ||
21 | <FileUpgradeFlags> | 24 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 25 | </FileUpgradeFlags> |
23 | </PropertyGroup> | 26 | </PropertyGroup> |
@@ -28,7 +31,8 @@ | |||
28 | <ConfigurationOverrideFile> | 31 | <ConfigurationOverrideFile> |
29 | </ConfigurationOverrideFile> | 32 | </ConfigurationOverrideFile> |
30 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 33 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | 34 | <DocumentationFile> |
35 | </DocumentationFile> | ||
32 | <DebugSymbols>True</DebugSymbols> | 36 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 37 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 38 | <Optimize>False</Optimize> |
@@ -37,7 +41,8 @@ | |||
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
39 | <WarningLevel>4</WarningLevel> | 43 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | 44 | <NoWarn> |
45 | </NoWarn> | ||
41 | </PropertyGroup> | 46 | </PropertyGroup> |
42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -46,7 +51,8 @@ | |||
46 | <ConfigurationOverrideFile> | 51 | <ConfigurationOverrideFile> |
47 | </ConfigurationOverrideFile> | 52 | </ConfigurationOverrideFile> |
48 | <DefineConstants>TRACE</DefineConstants> | 53 | <DefineConstants>TRACE</DefineConstants> |
49 | <DocumentationFile></DocumentationFile> | 54 | <DocumentationFile> |
55 | </DocumentationFile> | ||
50 | <DebugSymbols>False</DebugSymbols> | 56 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 57 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 58 | <Optimize>True</Optimize> |
@@ -55,18 +61,20 @@ | |||
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
57 | <WarningLevel>4</WarningLevel> | 63 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | 64 | <NoWarn> |
65 | </NoWarn> | ||
59 | </PropertyGroup> | 66 | </PropertyGroup> |
60 | <ItemGroup> | 67 | <ItemGroup> |
61 | <Reference Include="libsecondlife.dll" > | 68 | <Reference Include="libsecondlife.dll"> |
62 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 69 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
63 | <Private>False</Private> | 70 | <Private>False</Private> |
64 | </Reference> | 71 | </Reference> |
65 | <Reference Include="System" > | 72 | <Reference Include="System"> |
66 | <HintPath>System.dll</HintPath> | 73 | <HintPath>System.dll</HintPath> |
67 | <Private>False</Private> | 74 | <Private>False</Private> |
68 | </Reference> | 75 | </Reference> |
69 | <Reference Include="System.Xml" > | 76 | <Reference Include="System.Data" /> |
77 | <Reference Include="System.Xml"> | ||
70 | <HintPath>System.Xml.dll</HintPath> | 78 | <HintPath>System.Xml.dll</HintPath> |
71 | <Private>False</Private> | 79 | <Private>False</Private> |
72 | </Reference> | 80 | </Reference> |
@@ -76,13 +84,13 @@ | |||
76 | <Name>OpenGrid.Framework.Communications</Name> | 84 | <Name>OpenGrid.Framework.Communications</Name> |
77 | <Project>{683344D5-0000-0000-0000-000000000000}</Project> | 85 | <Project>{683344D5-0000-0000-0000-000000000000}</Project> |
78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
79 | <Private>False</Private> | 87 | <Private>False</Private> |
80 | </ProjectReference> | 88 | </ProjectReference> |
81 | <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | 89 | <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> |
82 | <Name>OpenSim.Framework</Name> | 90 | <Name>OpenSim.Framework</Name> |
83 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 91 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
84 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
85 | <Private>False</Private> | 93 | <Private>False</Private> |
86 | </ProjectReference> | 94 | </ProjectReference> |
87 | </ItemGroup> | 95 | </ItemGroup> |
88 | <ItemGroup> | 96 | <ItemGroup> |
@@ -92,6 +100,9 @@ | |||
92 | <Compile Include="LocalBackEndServices.cs"> | 100 | <Compile Include="LocalBackEndServices.cs"> |
93 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
94 | </Compile> | 102 | </Compile> |
103 | <Compile Include="LocalLoginManagement\LocalLoginService.cs" /> | ||
104 | <Compile Include="LocalUserManagement\LocalUserServices.cs" /> | ||
105 | <Compile Include="LocalUserManagement\UserProfileManager.cs" /> | ||
95 | <Compile Include="Properties\AssemblyInfo.cs"> | 106 | <Compile Include="Properties\AssemblyInfo.cs"> |
96 | <SubType>Code</SubType> | 107 | <SubType>Code</SubType> |
97 | </Compile> | 108 | </Compile> |
@@ -103,4 +114,4 @@ | |||
103 | <PostBuildEvent> | 114 | <PostBuildEvent> |
104 | </PostBuildEvent> | 115 | </PostBuildEvent> |
105 | </PropertyGroup> | 116 | </PropertyGroup> |
106 | </Project> | 117 | </Project> \ No newline at end of file |