mirror of
https://github.com/opensim/opensim.git
synced 2026-08-09 18:55:58 +08:00
* Only allow logins on standalone when the sim has completed it's initial startup (script startup doesn't count here)
* There was a small window where region logins were allowed before modules were loaded - avatars logins that hit this window could have caused bad things to happen. * A similar change will follow for grid mode sometime soon
This commit is contained in:
@@ -51,12 +51,20 @@ namespace OpenSim.Framework.Communications.Cache
|
||||
/// </summary>
|
||||
private readonly Dictionary<UUID, CachedUserInfo> m_userProfiles = new Dictionary<UUID, CachedUserInfo>();
|
||||
|
||||
public readonly LibraryRootFolder libraryRoot = new LibraryRootFolder();
|
||||
/// <summary>
|
||||
/// The root library folder.
|
||||
/// </summary>
|
||||
public readonly LibraryRootFolder LibraryRoot;
|
||||
|
||||
// Methods
|
||||
public UserProfileCacheService(CommunicationsManager commsManager)
|
||||
/// <summary>
|
||||
/// Constructor
|
||||
/// </summary>
|
||||
/// <param name="commsManager"></param>
|
||||
/// <param name="libraryRootFolder"></param>
|
||||
public UserProfileCacheService(CommunicationsManager commsManager, LibraryRootFolder libraryRootFolder)
|
||||
{
|
||||
m_commsManager = commsManager;
|
||||
LibraryRoot = libraryRootFolder;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -293,10 +301,10 @@ namespace OpenSim.Framework.Communications.Cache
|
||||
// FIXME MAYBE: We're not handling sortOrder!
|
||||
|
||||
InventoryFolderImpl fold = null;
|
||||
if ((fold = libraryRoot.FindFolder(folderID)) != null)
|
||||
if ((fold = LibraryRoot.FindFolder(folderID)) != null)
|
||||
{
|
||||
remoteClient.SendInventoryFolderDetails(
|
||||
libraryRoot.Owner, folderID, fold.RequestListOfItems(),
|
||||
LibraryRoot.Owner, folderID, fold.RequestListOfItems(),
|
||||
fold.RequestListOfFolders(), fetchFolders, fetchItems);
|
||||
|
||||
return;
|
||||
@@ -337,7 +345,7 @@ namespace OpenSim.Framework.Communications.Cache
|
||||
// FIXME MAYBE: We're not handling sortOrder!
|
||||
|
||||
InventoryFolderImpl fold;
|
||||
if ((fold = libraryRoot.FindFolder(folderID)) != null)
|
||||
if ((fold = LibraryRoot.FindFolder(folderID)) != null)
|
||||
{
|
||||
return fold.RequestListOfItems();
|
||||
}
|
||||
@@ -428,7 +436,7 @@ namespace OpenSim.Framework.Communications.Cache
|
||||
|
||||
public void HandleFetchInventory(IClientAPI remoteClient, UUID itemID, UUID ownerID)
|
||||
{
|
||||
if (ownerID == libraryRoot.Owner)
|
||||
if (ownerID == LibraryRoot.Owner)
|
||||
{
|
||||
//Console.WriteLine("request info for library item");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user