OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Started major restructusing of comms to prepare for better grid and region functionality 

* Working towards one shared set of services
* Killed off two projects with very little functionality
afrisby
lbsa71 2007-09-24 07:30:30 +00:00
parent 9ccab46ae8
commit 1302ef44e3
23 changed files with 261 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
OpenSim/Framework/UserManager/CAPSService.cs → OpenSim/Framework/Communications/CAPSService.cs
View File

2
OpenSim/Framework/Communications/Cache/AssetTransactions.cs
View File

@ -316,7 +316,7 @@ namespace OpenSim.Framework.Communications.Caches
{
//really need to fix this call, if lbsa71 saw this he would die.
this.m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(this.Asset);
CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfiles.GetUserDetails(ourClient.AgentId);
CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfileCache.GetUserDetails(ourClient.AgentId);
if (userInfo != null)
{
InventoryItemBase item = new InventoryItemBase();

6
OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
View File

@ -101,7 +101,7 @@ namespace OpenSim.Framework.Communications.Caches
if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
{
this.ItemReceive(userID, itemInfo);
this.m_parentCommsManager.InventoryServer.AddNewInventoryItem(userID, itemInfo);
this.m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
}
}
@ -109,7 +109,7 @@ namespace OpenSim.Framework.Communications.Caches
{
if ((userID == this.UserProfile.UUID) && (this.RootFolder != null))
{
this.m_parentCommsManager.InventoryServer.AddNewInventoryItem(userID, itemInfo);
this.m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
}
}
@ -121,7 +121,7 @@ namespace OpenSim.Framework.Communications.Caches
result = RootFolder.DeleteItem(item.inventoryID);
if (result)
{
this.m_parentCommsManager.InventoryServer.DeleteInventoryItem(userID, item);
this.m_parentCommsManager.InventoryService.DeleteInventoryItem(userID, item);
}
}
return result;

6
OpenSim/Framework/Communications/Cache/UserProfileCache.cs
View File

@ -106,7 +106,7 @@ namespace OpenSim.Framework.Communications.Caches
InventoryFolder createdFolder = info.RootFolder.CreateNewSubFolder(folderID, folderName, folderType);
if (createdFolder != null)
{
this.m_parent.InventoryServer.AddNewInventoryFolder(remoteClient.AgentId, createdFolder);
this.m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdFolder);
}
}
else
@ -181,7 +181,7 @@ namespace OpenSim.Framework.Communications.Caches
/// <param name="userID"></param>
private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo)
{
this.m_parent.InventoryServer.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
this.m_parent.InventoryService.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
}
/// <summary>
@ -190,7 +190,7 @@ namespace OpenSim.Framework.Communications.Caches
/// <param name="userID"></param>
private UserProfileData RequestUserProfileForUser(LLUUID userID)
{
return this.m_parent.UserServer.GetUserProfile(userID);
return this.m_parent.UserService.GetUserProfile(userID);
}
/// <summary>

101
OpenSim/Framework/Communications/CommunicationsManager.cs
View File

@ -37,81 +37,74 @@ namespace OpenSim.Framework.Communications
{
public class CommunicationsManager
{
protected AssetCache m_assetCache;
protected IGridServices m_gridServer;
protected IUserServices m_userService;
public IUserServices UserService
{
get { return m_userService; }
}
protected IGridServices m_gridService;
public IGridServices GridService
{
get { return m_gridService; }
}
protected IInventoryServices m_inventoryService;
public IInventoryServices InventoryService
{
get { return m_inventoryService; }
}
protected IInterRegionCommunications m_interRegion;
protected IInventoryServices m_inventoryServer;
public IInterRegionCommunications InterRegion
{
get { return m_interRegion; }
}
protected UserProfileCache m_userProfileCache;
public UserProfileCache UserProfileCache
{
get { return m_userProfileCache; }
}
protected AssetTransactionManager m_transactionsManager;
protected UserProfileCache m_userProfiles;
protected IUserServices m_userServer;
public AssetTransactionManager TransactionsManager
{
get { return m_transactionsManager; }
}
protected AssetCache m_assetCache;
public AssetCache AssetCache
{
get { return m_assetCache; }
}
protected NetworkServersInfo m_networkServersInfo;
public NetworkServersInfo NetworkServersInfo
{
get { return m_networkServersInfo; }
}
public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache)
{
m_networkServersInfo = serversInfo;
m_assetCache = assetCache;
m_userProfiles = new UserProfileCache(this);
m_userProfileCache = new UserProfileCache(this);
m_transactionsManager = new AssetTransactionManager(this);
}
public IUserServices UserServer
{
get { return m_userServer; }
set { m_userServer = value; }
}
public IGridServices GridServer
{
get { return m_gridServer; }
}
public IInventoryServices InventoryServer
{
get { return m_inventoryServer; }
set { m_inventoryServer = value; }
}
public IInterRegionCommunications InterRegion
{
get { return m_interRegion; }
set { m_interRegion = value; }
}
public UserProfileCache UserProfiles
{
get { return m_userProfiles; }
set { m_userProfiles = value; }
}
public AssetTransactionManager TransactionsManager
{
get { return m_transactionsManager; }
set { m_transactionsManager = value; }
}
public AssetCache AssetCache
{
get { return m_assetCache; }
set { m_assetCache = value; }
}
public NetworkServersInfo NetworkServersInfo
{
get { return m_networkServersInfo; }
set { m_networkServersInfo = value; }
}
#region Packet Handlers
public void HandleUUIDNameRequest(LLUUID uuid, IClientAPI remote_client)
{
if (uuid == m_userProfiles.libraryRoot.agentID)
if (uuid == m_userProfileCache.libraryRoot.agentID)
{
remote_client.SendNameReply(uuid, "Mr", "OpenSim");
}
else
{
UserProfileData profileData = m_userServer.GetUserProfile(uuid);
UserProfileData profileData = m_userService.GetUserProfile(uuid);
if (profileData != null)
{
LLUUID profileId = profileData.UUID;

8
OpenSim/Framework/Communications/IInventoryServices.cs
View File

@ -17,5 +17,13 @@ namespace OpenSim.Framework.Communications
void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder);
void AddNewInventoryItem(LLUUID userID, InventoryItemBase item);
void DeleteInventoryItem(LLUUID userID, InventoryItemBase item);
void CreateNewUserInventory(LLUUID user);
/// <summary>
/// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree)
/// </summary>
/// <param name="userID"></param>
/// <returns></returns>
List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID);
}
}

5
OpenSim/Framework/Communications/IUserServices.cs
View File

@ -40,5 +40,10 @@ namespace OpenSim.Framework.Communications
UserProfileData SetupMasterUser(string firstName, string lastName);
UserProfileData SetupMasterUser(string firstName, string lastName, string password);
/// <summary>
///
/// </summary>
/// <param name="user"></param>
void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY);
}
}

11
OpenSim/Framework/InventoryServiceBase/InventoryServiceBase.cs → OpenSim/Framework/Communications/InventoryServiceBase.cs
View File

@ -2,12 +2,14 @@ using System;
using System.Collections.Generic;
using System.Reflection;
using libsecondlife;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Console;
using OpenSim.Framework.Data;
using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
namespace OpenSim.Framework.InventoryServiceBase
namespace OpenSim.Framework.Communications
{
public class InventoryServiceBase
public abstract class InventoryServiceBase : IInventoryServices
{
protected Dictionary<string, IInventoryData> m_plugins = new Dictionary<string, IInventoryData>();
//protected IAssetServer m_assetServer;
@ -200,5 +202,10 @@ namespace OpenSim.Framework.InventoryServiceBase
Folders.Add(folder.folderID, folder);
}
}
public abstract void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack);
public abstract void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder);
public abstract void AddNewInventoryItem(LLUUID userID, InventoryItemBase item);
public abstract void DeleteInventoryItem(LLUUID userID, InventoryItemBase item);
}
}

0
OpenSim/Framework/UserManager/LoginResponse.cs → OpenSim/Framework/Communications/LoginResponse.cs
View File

0
OpenSim/Framework/UserManager/LoginService.cs → OpenSim/Framework/Communications/LoginService.cs
View File

6
OpenSim/Framework/UserManager/UserManagerBase.cs → OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -33,6 +33,7 @@ using System.Reflection;
using System.Security.Cryptography;
using libsecondlife;
using Nwc.XmlRpc;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Configuration;
using OpenSim.Framework.Console;
using OpenSim.Framework.Data;
@ -40,7 +41,7 @@ using OpenSim.Framework.Utilities;
namespace OpenSim.Framework.UserManagement
{
public abstract class UserManagerBase
public abstract class UserManagerBase : IUserServices
{
public UserConfig _config;
Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
@ -372,6 +373,7 @@ namespace OpenSim.Framework.UserManagement
}
}
// Rest and XML-RPC methods. (have moved them to a sub class in the user server)
public abstract UserProfileData SetupMasterUser(string firstName, string lastName);
public abstract UserProfileData SetupMasterUser(string firstName, string lastName, string password);
}
}

10
OpenSim/Grid/UserServer/UserManager.cs
View File

@ -159,5 +159,15 @@ namespace OpenSim.Grid.UserServer
return ProfileToXmlRPCResponse(userProfile);
}
#endregion
public override UserProfileData SetupMasterUser(string firstName, string lastName)
{
throw new Exception("The method or operation is not implemented.");
}
public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
{
throw new Exception("The method or operation is not implemented.");
}
}
}

2
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@ -112,7 +112,7 @@ namespace OpenSim.Region.ClientStack
scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D());
//Master Avatar Setup
UserProfileData masterAvatar = m_commsManager.UserServer.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword);
UserProfileData masterAvatar = m_commsManager.UserService.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword);
if (masterAvatar != null)
{
m_log.Verbose("PARCEL", "Found master avatar [" + masterAvatar.UUID.ToStringHyphenated() + "]");

36
OpenSim/Region/Communications/Local/CommunicationsLocal.cs
View File

@ -26,24 +26,22 @@
*
*/
using System;
using libsecondlife;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Types;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Console;
using OpenSim.Framework.Utilities;
using OpenSim.Framework.Data;
using OpenSim.Framework.UserManagement;
using libsecondlife;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
namespace OpenSim.Region.Communications.Local
{
public class CommunicationsLocal : CommunicationsManager
{
public LocalBackEndServices InstanceServices;
public LocalUserServices UserServices;
public IUserServices UserServices;
public LocalLoginService LoginServices;
public LocalInventoryService InvenServices;
protected LocalSettings m_settings;
@ -58,21 +56,21 @@ namespace OpenSim.Region.Communications.Local
{
m_settings = settings;
InvenServices = new LocalInventoryService();
InvenServices.AddPlugin(m_settings.InventoryPlugin);
m_inventoryServer = InvenServices;
LocalInventoryService inventoryService = new LocalInventoryService();
inventoryService.AddPlugin(m_settings.InventoryPlugin);
UserServices = new LocalUserServices(this, serversInfo);
UserServices.AddPlugin(m_settings.UserDatabasePlugin);
m_userServer = UserServices;
m_inventoryService = inventoryService;
LocalUserServices userService = new LocalUserServices(this, serversInfo);
userService.AddPlugin(m_settings.UserDatabasePlugin);
UserServices = userService;
m_userService = UserServices;
InstanceServices = new LocalBackEndServices();
m_gridServer = InstanceServices;
m_gridService = InstanceServices;
m_interRegion = InstanceServices;
//CapsServices = new CAPSService(httpServer);
LoginServices = new LocalLoginService(UserServices, m_settings.WelcomeMessage, this, serversInfo, m_settings.AccountAuthentication);
LoginServices = new LocalLoginService(userService, m_settings.WelcomeMessage, this, serversInfo, m_settings.AccountAuthentication);
httpServer.AddXmlRPCHandler("login_to_simulator", LoginServices.XmlRpcLoginMethod);
}
@ -121,14 +119,14 @@ namespace OpenSim.Region.Communications.Local
string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + "");
this.UserServices.AddUserProfile(firstName, lastName, md5PasswdHash, regX, regY);
UserProfileData userProf = this.UserServer.GetUserProfile(firstName, lastName);
UserProfileData userProf = this.UserService.GetUserProfile(firstName, lastName);
if (userProf == null)
{
return LLUUID.Zero;
}
else
{
this.InvenServices.CreateNewUserInventory(userProf.UUID);
this.m_inventoryService.CreateNewUserInventory(userProf.UUID);
Console.WriteLine("Created new inventory set for " + firstName + " " + lastName);
return userProf.UUID;
}

15
OpenSim/Region/Communications/Local/LocalInventoryService.cs
View File

@ -1,17 +1,12 @@
using System;
using System.Collections.Generic;
using libsecondlife;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Data;
using OpenSim.Framework.Types;
using OpenSim.Framework.UserManagement;
using OpenSim.Framework.Utilities;
using OpenSim.Framework.InventoryServiceBase;
using InventoryFolder=OpenSim.Framework.Communications.Caches.InventoryFolder;
namespace OpenSim.Region.Communications.Local
{
public class LocalInventoryService : InventoryServiceBase , IInventoryServices
public class LocalInventoryService : InventoryServiceBase
{
public LocalInventoryService()
@ -19,7 +14,7 @@ namespace OpenSim.Region.Communications.Local
}
public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack)
public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack)
{
List<InventoryFolderBase> folders = this.RequestFirstLevelFolders(userID);
InventoryFolder rootFolder = null;
@ -54,17 +49,17 @@ namespace OpenSim.Region.Communications.Local
}
}
public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder)
public override void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder)
{
this.AddFolder(folder);
}
public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
public override void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
{
this.AddItem(item);
}
public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
public override void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
{
this.deleteItem(item);
}

6
OpenSim/Region/Communications/Local/LocalLoginService.cs
View File

@ -49,7 +49,7 @@ namespace OpenSim.Region.Communications.Local
profile = this.m_userManager.GetUserProfile(firstname, lastname);
if (profile != null)
{
m_Parent.InvenServices.CreateNewUserInventory(profile.UUID);
m_Parent.InventoryService.CreateNewUserInventory(profile.UUID);
}
return profile;
@ -80,7 +80,7 @@ namespace OpenSim.Region.Communications.Local
public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)
{
ulong currentRegion = theUser.currentAgent.currentHandle;
RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion);
RegionInfo reg = m_Parent.GridService.RequestNeighbourInfo(currentRegion);
if (reg != null)
{
@ -119,7 +119,7 @@ namespace OpenSim.Region.Communications.Local
protected override InventoryData CreateInventoryData(LLUUID userID)
{
List<InventoryFolderBase> folders = this.m_Parent.InvenServices.RequestFirstLevelFolders(userID);
List<InventoryFolderBase> folders = m_Parent.InventoryService.RequestFirstLevelFolders(userID);
if (folders.Count > 0)
{
LLUUID rootID = LLUUID.Zero;

8
OpenSim/Region/Communications/Local/LocalUserServices.cs
View File

@ -6,7 +6,7 @@ using OpenSim.Framework.UserManagement;
namespace OpenSim.Region.Communications.Local
{
public class LocalUserServices : UserManagerBase, IUserServices
public class LocalUserServices : UserManagerBase
{
private readonly CommunicationsLocal m_parent;
@ -24,12 +24,12 @@ namespace OpenSim.Region.Communications.Local
m_defaultHomeY = m_serversInfo.DefaultHomeLocY;
}
public UserProfileData SetupMasterUser(string firstName, string lastName)
public override UserProfileData SetupMasterUser(string firstName, string lastName)
{
return SetupMasterUser(firstName, lastName, "");
}
public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
public override UserProfileData SetupMasterUser(string firstName, string lastName, string password)
{
UserProfileData profile = GetUserProfile(firstName, lastName);
if (profile != null)
@ -48,7 +48,7 @@ namespace OpenSim.Region.Communications.Local
}
else
{
m_parent.InvenServices.CreateNewUserInventory(profile.UUID);
m_parent.InventoryService.CreateNewUserInventory(profile.UUID);
}
return profile;

6
OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
View File

@ -11,11 +11,11 @@ namespace OpenSim.Region.Communications.OGS1
public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache)
{
OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer);
m_gridServer = gridInterComms;
m_gridService = gridInterComms;
m_interRegion = gridInterComms;
m_inventoryServer = new OGS1InventoryService();
m_userServer = new OGS1UserServices(this);
m_inventoryService = new OGS1InventoryService();
m_userService = new OGS1UserServices(this);
}
}
}

22
OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
View File

@ -15,24 +15,38 @@ namespace OpenSim.Region.Communications.OGS1
}
#region IInventoryServices Members
public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack)
{
throw new Exception("The method or operation is not implemented.");
}
public void AddNewInventoryFolder(LLUUID userID, InventoryFolder folder)
{
throw new Exception("The method or operation is not implemented.");
}
public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
{
throw new Exception("The method or operation is not implemented.");
}
public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
{
throw new Exception("The method or operation is not implemented.");
}
}
public void CreateNewUserInventory(LLUUID user)
{
throw new Exception("The method or operation is not implemented.");
}
public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)
{
throw new Exception("The method or operation is not implemented.");
}
#endregion
}
}

5
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@ -101,5 +101,10 @@ namespace OpenSim.Region.Communications.OGS1
UserProfileData profile = GetUserProfile(firstName, lastName);
return profile;
}
public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
{
throw new Exception("The method or operation is not implemented.");
}
}
}

14
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -27,7 +27,7 @@ namespace OpenSim.Region.Environment.Scenes
public void AddInventoryItem(IClientAPI remoteClient, InventoryItemBase item)
{
CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
if (userInfo != null)
{
userInfo.AddItem(remoteClient.AgentId, item);
@ -49,7 +49,7 @@ namespace OpenSim.Region.Environment.Scenes
public LLUUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID itemID, byte[] data)
{
CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
if (userInfo != null)
{
if (userInfo.RootFolder != null)
@ -89,7 +89,7 @@ namespace OpenSim.Region.Environment.Scenes
public void UDPUpdateInventoryItemAsset(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID,
LLUUID itemID)
{
CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
if (userInfo != null)
{
if (userInfo.RootFolder != null)
@ -154,7 +154,7 @@ namespace OpenSim.Region.Environment.Scenes
{
if (transActionID == LLUUID.Zero)
{
CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
if (userInfo != null)
{
AssetBase asset = new AssetBase();
@ -244,7 +244,7 @@ namespace OpenSim.Region.Environment.Scenes
public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID)
{
CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
LLUUID copyID = LLUUID.Random();
if (userInfo != null)
{
@ -335,7 +335,7 @@ namespace OpenSim.Region.Environment.Scenes
if (PermissionsMngr.CanDeRezObject(remoteClient.AgentId, ((SceneObjectGroup) selectedEnt).UUID))
{
string sceneObjectXml = ((SceneObjectGroup) selectedEnt).ToXmlString();
CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
if (userInfo != null)
{
AssetBase asset = new AssetBase();
@ -391,7 +391,7 @@ namespace OpenSim.Region.Environment.Scenes
public void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos)
{
CachedUserInfo userInfo = commsManager.UserProfiles.GetUserDetails(remoteClient.AgentId);
CachedUserInfo userInfo = commsManager.UserProfileCache.GetUserDetails(remoteClient.AgentId);
if (userInfo != null)
{
if (userInfo.RootFolder != null)

18
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -649,7 +649,7 @@ namespace OpenSim.Region.Environment.Scenes
CreateAndAddScenePresence(client, child);
m_LandManager.sendParcelOverlay(client);
commsManager.UserProfiles.AddNewUser(client.AgentId);
commsManager.UserProfileCache.AddNewUser(client.AgentId);
commsManager.TransactionsManager.AddUser(client.AgentId);
}
@ -697,10 +697,10 @@ namespace OpenSim.Region.Environment.Scenes
client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage);
client.OnCreateNewInventoryItem += CreateNewInventoryItem;
client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder;
client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents;
client.OnCreateNewInventoryFolder += commsManager.UserProfileCache.HandleCreateInventoryFolder;
client.OnFetchInventoryDescendents += commsManager.UserProfileCache.HandleFecthInventoryDescendents;
client.OnRequestTaskInventory += RequestTaskInventory;
client.OnFetchInventory += commsManager.UserProfiles.HandleFetchInventory;
client.OnFetchInventory += commsManager.UserProfileCache.HandleFetchInventory;
client.OnUpdateInventoryItem += UDPUpdateInventoryItemAsset;
client.OnAssetUploadRequest += commsManager.TransactionsManager.HandleUDPUploadRequest;
client.OnXferReceive += commsManager.TransactionsManager.HandleXfer;
@ -796,7 +796,7 @@ namespace OpenSim.Region.Environment.Scenes
avatar.Close();
// Remove client agent from profile, so new logins will work
commsManager.UserServer.clearUserAgent(agentID);
commsManager.UserService.clearUserAgent(agentID);
return;
}
@ -927,7 +927,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
public void RegisterRegionWithComms()
{
regionCommsHost = commsManager.GridServer.RegisterRegion(m_regInfo);
regionCommsHost = commsManager.GridService.RegisterRegion(m_regInfo);
if (regionCommsHost != null)
{
regionCommsHost.OnExpectUser += NewUserConnection;
@ -989,7 +989,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
public void InformClientOfNeighbours(IClientAPI remoteClient)
{
List<RegionInfo> neighbours = commsManager.GridServer.RequestNeighbours(m_regInfo);
List<RegionInfo> neighbours = commsManager.GridService.RequestNeighbours(m_regInfo);
if (neighbours != null)
{
@ -1014,7 +1014,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <returns></returns>
public RegionInfo RequestNeighbouringRegionInfo(ulong regionHandle)
{
return commsManager.GridServer.RequestNeighbourInfo(regionHandle);
return commsManager.GridService.RequestNeighbourInfo(regionHandle);
}
/// <summary>
@ -1027,7 +1027,7 @@ namespace OpenSim.Region.Environment.Scenes
public void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY)
{
List<MapBlockData> mapBlocks;
mapBlocks = commsManager.GridServer.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
mapBlocks = commsManager.GridService.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
remoteClient.SendMapBlock(mapBlocks);
}

62
prebuild.xml
View File

@ -353,62 +353,6 @@
</Files>
</Project>
<Project name="OpenSim.Framework.UserManagement" path="OpenSim/Framework/UserManager" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
<OutputPath>../../../bin/</OutputPath>
</Options>
</Configuration>
<ReferencePath>../../../bin/</ReferencePath>
<Reference name="System" localCopy="false"/>
<Reference name="System.Data" localCopy="false"/>
<Reference name="System.Xml" localCopy="false"/>
<Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Data"/>
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="libsecondlife.dll"/>
<Reference name="Db4objects.Db4o.dll"/>
<Files>
<Match pattern="*.cs" recurse="true"/>
</Files>
</Project>
<Project name="OpenSim.Framework.InventoryServiceBase" path="OpenSim/Framework/InventoryServiceBase" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
<OutputPath>../../../bin/</OutputPath>
</Options>
</Configuration>
<ReferencePath>../../../bin/</ReferencePath>
<Reference name="System" localCopy="false"/>
<Reference name="System.Data" localCopy="false"/>
<Reference name="System.Xml" localCopy="false"/>
<Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Data"/>
<Reference name="libsecondlife.dll"/>
<Files>
<Match pattern="*.cs" recurse="true"/>
</Files>
</Project>
<!-- OpenSim.Framework.Communications -->
<Project name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library">
<Configuration name="Debug">
@ -432,6 +376,7 @@
<Reference name="libsecondlife.dll"/>
<Reference name="Db4objects.Db4o.dll"/>
<Reference name="Nini.dll" />
<Reference name="XMLRPC.dll"/>
<Files>
<Match pattern="*.cs" recurse="true"/>
@ -484,7 +429,6 @@
<Reference name="System"/>
<Reference name="System.Xml"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Framework.UserManagement" />
<Reference name="OpenSim.Framework.Data" />
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Console"/>
@ -676,7 +620,6 @@
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Region.Communications.OGS1"/>
<Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.UserManagement" />
<Reference name="OpenSim.Region.Communications.Local"/>
<Reference name="Nini.dll" />
<Files>
@ -709,7 +652,6 @@
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.UserManagement"/>
<Reference name="OpenSim.Framework.Data"/>
<Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="XMLRPC.dll"/>
@ -879,9 +821,9 @@
<Reference name="System.Xml" localCopy="false"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Framework.Data"/>
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.UserManagement" />
<Reference name="libsecondlife.dll"/>
<Reference name="Db4objects.Db4o.dll"/>
<Reference name="XMLRPC.dll"/>