* 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

1 files changed, 4 insertions, 5 deletions

diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 5bed282..198bd83 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -112,11 +112,11 @@ namespace OpenSim.Framework.Communications
         /// <param name="assetCache"></param>
         /// <param name="dumpAssetsToFile"></param>
         public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache,
-                                     bool dumpAssetsToFile)
+                                     bool dumpAssetsToFile, LibraryRootFolder libraryRootFolder)
         {
             m_networkServersInfo = serversInfo;
             m_assetCache = assetCache;
-            m_userProfileCacheService = new UserProfileCacheService(this);
+            m_userProfileCacheService = new UserProfileCacheService(this, libraryRootFolder);
          //   m_transactionsManager = new AgentAssetTransactionsManager(this, dumpAssetsToFile);
         }
 
@@ -356,7 +356,7 @@ namespace OpenSim.Framework.Communications
 
         public void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client)
         {
-            if (uuid == m_userProfileCacheService.libraryRoot.Owner)
+            if (uuid == m_userProfileCacheService.LibraryRoot.Owner)
             {
                 remote_client.SendNameReply(uuid, "Mr", "OpenSim");
             }
@@ -376,7 +376,6 @@ namespace OpenSim.Framework.Communications
             string[] returnstring = new string[0];
             bool doLookup = false;
 
-
             lock (m_nameRequestCache)
             {
                 if (m_nameRequestCache.ContainsKey(uuid))
@@ -405,8 +404,8 @@ namespace OpenSim.Framework.Communications
                     }
                 }
             }
+            
             return returnstring;
-
         }
 
         public bool UUIDNameCachedTest(UUID uuid)