*Added some missing files from last commit
*LoginService is now only used in LocalCommunications and not as a interface in RegionCommunicationsSugilite
parent
56c4a3df5b
commit
78af287448
|
@ -40,7 +40,6 @@ namespace OpenGrid.Framework.Communications
|
||||||
public class CommunicationsManager
|
public class CommunicationsManager
|
||||||
{
|
{
|
||||||
public IUserServices UserServer;
|
public IUserServices UserServer;
|
||||||
public ILoginService LoginServer;
|
|
||||||
public IGridServices GridServer;
|
public IGridServices GridServer;
|
||||||
public IInterRegionCommunications InterRegion;
|
public IInterRegionCommunications InterRegion;
|
||||||
|
|
||||||
|
|
|
@ -97,7 +97,6 @@
|
||||||
<Compile Include="IInterRegionCommunications.cs">
|
<Compile Include="IInterRegionCommunications.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="ILoginService.cs" />
|
|
||||||
<Compile Include="IUserServices.cs">
|
<Compile Include="IUserServices.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
|
@ -35,7 +35,6 @@ using OpenSim.Framework.Interfaces;
|
||||||
using OpenSim.Framework.Types;
|
using OpenSim.Framework.Types;
|
||||||
using OpenGrid.Framework.Communications;
|
using OpenGrid.Framework.Communications;
|
||||||
|
|
||||||
using OpenSim.LocalCommunications.LocalLoginManagement;
|
|
||||||
using OpenSim.LocalCommunications.LocalUserManagement;
|
using OpenSim.LocalCommunications.LocalUserManagement;
|
||||||
|
|
||||||
namespace OpenSim.LocalCommunications
|
namespace OpenSim.LocalCommunications
|
||||||
|
@ -44,14 +43,11 @@ namespace OpenSim.LocalCommunications
|
||||||
{
|
{
|
||||||
public LocalBackEndServices SandBoxManager = new LocalBackEndServices();
|
public LocalBackEndServices SandBoxManager = new LocalBackEndServices();
|
||||||
public LocalUserServices UserServices = new LocalUserServices();
|
public LocalUserServices UserServices = new LocalUserServices();
|
||||||
public LocalLoginService LoginService;
|
|
||||||
|
|
||||||
public CommunicationsLocal()
|
public CommunicationsLocal()
|
||||||
{
|
{
|
||||||
LoginService = new LocalLoginService(this.UserServices);
|
|
||||||
|
|
||||||
UserServer = UserServices;
|
UserServer = UserServices;
|
||||||
LoginServer = LoginService;
|
|
||||||
GridServer = SandBoxManager;
|
GridServer = SandBoxManager;
|
||||||
InterRegion = SandBoxManager;
|
InterRegion = SandBoxManager;
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,36 @@
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,42 @@
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
|
@ -100,7 +100,7 @@
|
||||||
<Compile Include="LocalBackEndServices.cs">
|
<Compile Include="LocalBackEndServices.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="LocalLoginManagement\LocalLoginService.cs" />
|
<Compile Include="LocalUserManagement\LocalLoginService.cs" />
|
||||||
<Compile Include="LocalUserManagement\LocalUserServices.cs" />
|
<Compile Include="LocalUserManagement\LocalUserServices.cs" />
|
||||||
<Compile Include="LocalUserManagement\UserProfileManager.cs" />
|
<Compile Include="LocalUserManagement\UserProfileManager.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs">
|
<Compile Include="Properties\AssemblyInfo.cs">
|
||||||
|
|
Loading…
Reference in New Issue