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

* minor: Rename IInterGridInventoryServices since it's inter service rather than inter grid

0.6.0-stable
Justin Clarke Casey 2008-07-24 15:20:57 +00:00
parent a4ad6a67b7
commit 29e8fcd13c
10 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,11 +88,11 @@ namespace OpenSim.Framework.Communications
} }
protected AssetCache m_assetCache; protected AssetCache m_assetCache;
public IInterGridInventoryServices InterGridInventoryService public IInterServiceInventoryServices InterServiceInventoryService
{ {
get { return m_interGridInventoryService; } get { return m_interServiceInventoryService; }
} }
protected IInterGridInventoryServices m_interGridInventoryService; protected IInterServiceInventoryServices m_interServiceInventoryService;
public NetworkServersInfo NetworkServersInfo public NetworkServersInfo NetworkServersInfo
{ {
@ -296,7 +296,7 @@ namespace OpenSim.Framework.Communications
} }
else else
{ {
InventoryService.CreateNewUserInventory(userProf.ID); InterServiceInventoryService.CreateNewUserInventory(userProf.ID);
m_log.Info("[USERS]: Created new inventory set for " + firstName + " " + lastName); m_log.Info("[USERS]: Created new inventory set for " + firstName + " " + lastName);
return userProf.ID; return userProf.ID;
} }

2
OpenSim/Framework/Communications/IInterGridInventoryServices.cs → OpenSim/Framework/Communications/IInterServiceInventoryServices.cs
View File

@ -33,7 +33,7 @@ namespace OpenSim.Framework.Communications
/// <summary> /// <summary>
/// Inventory operations used between grid services. /// Inventory operations used between grid services.
/// </summary> /// </summary>
public interface IInterGridInventoryServices public interface IInterServiceInventoryServices
{ {
/// <summary> /// <summary>
/// Create a new inventory for the given user. /// Create a new inventory for the given user.

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

@ -40,7 +40,7 @@ namespace OpenSim.Framework.Communications
/// <summary> /// <summary>
/// Defines all the operations one can perform on a user's inventory. /// Defines all the operations one can perform on a user's inventory.
/// </summary> /// </summary>
public interface IInventoryServices : IInterGridInventoryServices public interface IInventoryServices
{ {
string Host string Host
{ {

2
OpenSim/Framework/Communications/InventoryServiceBase.cs
View File

@ -38,7 +38,7 @@ namespace OpenSim.Framework.Communications
/// <summary> /// <summary>
/// Abstract base class used by local and grid implementations of an inventory service. /// Abstract base class used by local and grid implementations of an inventory service.
/// </summary> /// </summary>
public abstract class InventoryServiceBase : IInventoryServices, IInterGridInventoryServices public abstract class InventoryServiceBase : IInventoryServices, IInterServiceInventoryServices
{ {
private static readonly ILog m_log private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

6
OpenSim/Grid/UserServer/Main.cs
View File

@ -54,7 +54,7 @@ namespace OpenSim.Grid.UserServer
public UserManager m_userManager; public UserManager m_userManager;
public UserLoginService m_loginService; public UserLoginService m_loginService;
public MessageServersConnector m_messagesService; public MessageServersConnector m_messagesService;
protected IInventoryServices m_inventoryService; protected IInterServiceInventoryServices m_interServiceInventoryService;
private LLUUID m_lastCreatedUser = LLUUID.Random(); private LLUUID m_lastCreatedUser = LLUUID.Random();
@ -103,7 +103,7 @@ namespace OpenSim.Grid.UserServer
m_loginService = new UserLoginService( m_loginService = new UserLoginService(
m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
m_inventoryService = new OGS1InventoryService(m_userManager._config.InventoryUrl); m_interServiceInventoryService = new OGS1InventoryService(m_userManager._config.InventoryUrl);
m_messagesService = new MessageServersConnector(); m_messagesService = new MessageServersConnector();
@ -196,7 +196,7 @@ namespace OpenSim.Grid.UserServer
try try
{ {
if (!m_inventoryService.CreateNewUserInventory(userID)) if (!m_interServiceInventoryService.CreateNewUserInventory(userID))
{ {
throw new Exception( throw new Exception(
String.Format( String.Format(

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

@ -46,7 +46,7 @@ namespace OpenSim.Region.Communications.Local
{ {
AddInventoryService(inventoryService); AddInventoryService(inventoryService);
m_defaultInventoryHost = inventoryService.Host; m_defaultInventoryHost = inventoryService.Host;
m_interGridInventoryService = inventoryService; m_interServiceInventoryService = inventoryService;
m_userService = userService; m_userService = userService;
m_avatarService = (IAvatarService)userService; m_avatarService = (IAvatarService)userService;
m_gridService = gridService; m_gridService = gridService;

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

@ -85,7 +85,7 @@ namespace OpenSim.Region.Communications.Local
profile = m_userManager.GetUserProfile(firstname, lastname); profile = m_userManager.GetUserProfile(firstname, lastname);
if (profile != null) if (profile != null)
{ {
m_Parent.InterGridInventoryService.CreateNewUserInventory(profile.ID); m_Parent.InterServiceInventoryService.CreateNewUserInventory(profile.ID);
} }
return profile; return profile;
@ -260,13 +260,13 @@ namespace OpenSim.Region.Communications.Local
// See LoginService // See LoginService
protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl) protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl)
{ {
List<InventoryFolderBase> folders = m_Parent.InterGridInventoryService.GetInventorySkeleton(userID); List<InventoryFolderBase> folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
// If we have user auth but no inventory folders for some reason, create a new set of folders. // If we have user auth but no inventory folders for some reason, create a new set of folders.
if (null == folders || 0 == folders.Count) if (null == folders || 0 == folders.Count)
{ {
m_Parent.InterGridInventoryService.CreateNewUserInventory(userID); m_Parent.InterServiceInventoryService.CreateNewUserInventory(userID);
folders = m_Parent.InterGridInventoryService.GetInventorySkeleton(userID); folders = m_Parent.InterServiceInventoryService.GetInventorySkeleton(userID);
} }
LLUUID rootID = LLUUID.Zero; LLUUID rootID = LLUUID.Zero;

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

@ -37,7 +37,7 @@ namespace OpenSim.Region.Communications.Local
// private readonly NetworkServersInfo m_serversInfo; // private readonly NetworkServersInfo m_serversInfo;
private readonly uint m_defaultHomeX; private readonly uint m_defaultHomeX;
private readonly uint m_defaultHomeY; private readonly uint m_defaultHomeY;
private IInterGridInventoryServices m_interGridInventoryService; private IInterServiceInventoryServices m_interServiceInventoryService;
/// <summary> /// <summary>
/// ///
@ -48,14 +48,14 @@ namespace OpenSim.Region.Communications.Local
/// <param name="inventoryService"></param> /// <param name="inventoryService"></param>
/// <param name="statsCollector">Can be null if stats collection is not required.</param> /// <param name="statsCollector">Can be null if stats collection is not required.</param>
public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY, public LocalUserServices(NetworkServersInfo serversInfo, uint defaultHomeLocX, uint defaultHomeLocY,
IInterGridInventoryServices interGridInventoryService) IInterServiceInventoryServices interServiceInventoryService)
{ {
// m_serversInfo = serversInfo; // m_serversInfo = serversInfo;
m_defaultHomeX = defaultHomeLocX; m_defaultHomeX = defaultHomeLocX;
m_defaultHomeY = defaultHomeLocY; m_defaultHomeY = defaultHomeLocY;
m_interGridInventoryService = interGridInventoryService; m_interServiceInventoryService = interServiceInventoryService;
} }
public override UserProfileData SetupMasterUser(string firstName, string lastName) public override UserProfileData SetupMasterUser(string firstName, string lastName)
@ -82,7 +82,7 @@ namespace OpenSim.Region.Communications.Local
} }
else else
{ {
m_interGridInventoryService.CreateNewUserInventory(profile.ID); m_interServiceInventoryService.CreateNewUserInventory(profile.ID);
} }
return profile; return profile;

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

@ -39,7 +39,7 @@ using OpenSim.Framework.Statistics;
namespace OpenSim.Region.Communications.OGS1 namespace OpenSim.Region.Communications.OGS1
{ {
public class OGS1InventoryService : IInventoryServices, IInterGridInventoryServices public class OGS1InventoryService : IInventoryServices, IInterServiceInventoryServices
{ {
private static readonly ILog m_log private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

2
OpenSim/Region/Communications/OGS1/OGS1SecureInvenotryService.cs
View File

@ -39,7 +39,7 @@ using OpenSim.Framework.Statistics;
namespace OpenSim.Region.Communications.OGS1 namespace OpenSim.Region.Communications.OGS1
{ {
public class OGS1SecureInventoryService : ISecureInventoryService, IInterGridInventoryServices public class OGS1SecureInventoryService : ISecureInventoryService, IInterServiceInventoryServices
{ {
private static readonly ILog m_log private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);