diff options
Diffstat (limited to 'OpenSim')
4 files changed, 79 insertions, 5 deletions
diff --git a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs index e42e414..fb7dc7d 100644 --- a/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs +++ b/OpenSim/OpenSim.LocalCommunications/CommunicationsLocal.cs | |||
@@ -35,7 +35,6 @@ 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; | 38 | using OpenSim.LocalCommunications.LocalUserManagement; |
40 | 39 | ||
41 | namespace OpenSim.LocalCommunications | 40 | namespace OpenSim.LocalCommunications |
@@ -44,14 +43,11 @@ namespace OpenSim.LocalCommunications | |||
44 | { | 43 | { |
45 | public LocalBackEndServices SandBoxManager = new LocalBackEndServices(); | 44 | public LocalBackEndServices SandBoxManager = new LocalBackEndServices(); |
46 | public LocalUserServices UserServices = new LocalUserServices(); | 45 | public LocalUserServices UserServices = new LocalUserServices(); |
47 | public LocalLoginService LoginService; | ||
48 | 46 | ||
49 | public CommunicationsLocal() | 47 | public CommunicationsLocal() |
50 | { | 48 | { |
51 | LoginService = new LocalLoginService(this.UserServices); | ||
52 | 49 | ||
53 | UserServer = UserServices; | 50 | UserServer = UserServices; |
54 | LoginServer = LoginService; | ||
55 | GridServer = SandBoxManager; | 51 | GridServer = SandBoxManager; |
56 | InterRegion = SandBoxManager; | 52 | InterRegion = SandBoxManager; |
57 | } | 53 | } |
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs new file mode 100644 index 0000000..f438117 --- /dev/null +++ b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/LocalUserServices.cs | |||
@@ -0,0 +1,36 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | using OpenGrid.Framework.Communications; | ||
6 | using OpenSim.Framework.User; | ||
7 | |||
8 | using libsecondlife; | ||
9 | |||
10 | namespace OpenSim.LocalCommunications.LocalUserManagement | ||
11 | { | ||
12 | public class LocalUserServices : IUserServices | ||
13 | { | ||
14 | public UserProfileManager userProfileManager = new UserProfileManager(); | ||
15 | public LocalLoginService localLoginService; | ||
16 | public LocalUserServices() | ||
17 | { | ||
18 | localLoginService = new LocalLoginService(this); | ||
19 | } | ||
20 | |||
21 | public UserProfile GetUserProfile(string first_name, string last_name) | ||
22 | { | ||
23 | return GetUserProfile(first_name + " " + last_name); | ||
24 | } | ||
25 | |||
26 | public UserProfile GetUserProfile(string name) | ||
27 | { | ||
28 | return null; | ||
29 | } | ||
30 | public UserProfile GetUserProfile(LLUUID avatar_id) | ||
31 | { | ||
32 | return null; | ||
33 | } | ||
34 | |||
35 | } | ||
36 | } | ||
diff --git a/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs new file mode 100644 index 0000000..5f9d028 --- /dev/null +++ b/OpenSim/OpenSim.LocalCommunications/LocalUserManagement/UserProfileManager.cs | |||
@@ -0,0 +1,42 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | using libsecondlife; | ||
6 | using OpenSim.Framework.User; | ||
7 | |||
8 | namespace OpenSim.LocalCommunications.LocalUserManagement | ||
9 | { | ||
10 | public class UserProfileManager | ||
11 | { | ||
12 | Dictionary<LLUUID, UserProfile> userProfiles = new Dictionary<LLUUID, UserProfile>(); | ||
13 | |||
14 | public UserProfileManager() | ||
15 | { | ||
16 | } | ||
17 | |||
18 | private LLUUID getUserUUID(string first_name, string last_name) | ||
19 | { | ||
20 | return getUserUUID(first_name + " " + last_name); | ||
21 | } | ||
22 | private LLUUID getUserUUID(string name) | ||
23 | { | ||
24 | return null; | ||
25 | } | ||
26 | |||
27 | |||
28 | public UserProfile getUserProfile(string first_name, string last_name) | ||
29 | { | ||
30 | return getUserProfile(first_name + " " + last_name); | ||
31 | } | ||
32 | public UserProfile getUserProfile(string name) | ||
33 | { | ||
34 | return null; | ||
35 | } | ||
36 | public UserProfile getUserProfile(LLUUID user_id) | ||
37 | { | ||
38 | return null; | ||
39 | } | ||
40 | |||
41 | } | ||
42 | } | ||
diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj index af5d2d3..f7c28eb 100644 --- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj +++ b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj | |||
@@ -100,7 +100,7 @@ | |||
100 | <Compile Include="LocalBackEndServices.cs"> | 100 | <Compile Include="LocalBackEndServices.cs"> |
101 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
102 | </Compile> | 102 | </Compile> |
103 | <Compile Include="LocalLoginManagement\LocalLoginService.cs" /> | 103 | <Compile Include="LocalUserManagement\LocalLoginService.cs" /> |
104 | <Compile Include="LocalUserManagement\LocalUserServices.cs" /> | 104 | <Compile Include="LocalUserManagement\LocalUserServices.cs" /> |
105 | <Compile Include="LocalUserManagement\UserProfileManager.cs" /> | 105 | <Compile Include="LocalUserManagement\UserProfileManager.cs" /> |
106 | <Compile Include="Properties\AssemblyInfo.cs"> | 106 | <Compile Include="Properties\AssemblyInfo.cs"> |