aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-19 17:41:21 +0000
committerJustin Clarke Casey2008-09-19 17:41:21 +0000
commit5fb7b485b211bbf19f4531a051b78dde92da4ba3 (patch)
tree655778d09beb953613b1db282dcf4cc640d90697 /OpenSim/Framework/Communications/Cache
parentGuard LLRezObject against NaN (diff)
downloadopensim-SC_OLD-5fb7b485b211bbf19f4531a051b78dde92da4ba3.zip
opensim-SC_OLD-5fb7b485b211bbf19f4531a051b78dde92da4ba3.tar.gz
opensim-SC_OLD-5fb7b485b211bbf19f4531a051b78dde92da4ba3.tar.bz2
opensim-SC_OLD-5fb7b485b211bbf19f4531a051b78dde92da4ba3.tar.xz
* 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
Diffstat (limited to 'OpenSim/Framework/Communications/Cache')
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs22
1 files changed, 15 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 3675053..cf6a74d 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -51,12 +51,20 @@ namespace OpenSim.Framework.Communications.Cache
51 /// </summary> 51 /// </summary>
52 private readonly Dictionary<UUID, CachedUserInfo> m_userProfiles = new Dictionary<UUID, CachedUserInfo>(); 52 private readonly Dictionary<UUID, CachedUserInfo> m_userProfiles = new Dictionary<UUID, CachedUserInfo>();
53 53
54 public readonly LibraryRootFolder libraryRoot = new LibraryRootFolder(); 54 /// <summary>
55 /// The root library folder.
56 /// </summary>
57 public readonly LibraryRootFolder LibraryRoot;
55 58
56 // Methods 59 /// <summary>
57 public UserProfileCacheService(CommunicationsManager commsManager) 60 /// Constructor
61 /// </summary>
62 /// <param name="commsManager"></param>
63 /// <param name="libraryRootFolder"></param>
64 public UserProfileCacheService(CommunicationsManager commsManager, LibraryRootFolder libraryRootFolder)
58 { 65 {
59 m_commsManager = commsManager; 66 m_commsManager = commsManager;
67 LibraryRoot = libraryRootFolder;
60 } 68 }
61 69
62 /// <summary> 70 /// <summary>
@@ -293,10 +301,10 @@ namespace OpenSim.Framework.Communications.Cache
293 // FIXME MAYBE: We're not handling sortOrder! 301 // FIXME MAYBE: We're not handling sortOrder!
294 302
295 InventoryFolderImpl fold = null; 303 InventoryFolderImpl fold = null;
296 if ((fold = libraryRoot.FindFolder(folderID)) != null) 304 if ((fold = LibraryRoot.FindFolder(folderID)) != null)
297 { 305 {
298 remoteClient.SendInventoryFolderDetails( 306 remoteClient.SendInventoryFolderDetails(
299 libraryRoot.Owner, folderID, fold.RequestListOfItems(), 307 LibraryRoot.Owner, folderID, fold.RequestListOfItems(),
300 fold.RequestListOfFolders(), fetchFolders, fetchItems); 308 fold.RequestListOfFolders(), fetchFolders, fetchItems);
301 309
302 return; 310 return;
@@ -337,7 +345,7 @@ namespace OpenSim.Framework.Communications.Cache
337 // FIXME MAYBE: We're not handling sortOrder! 345 // FIXME MAYBE: We're not handling sortOrder!
338 346
339 InventoryFolderImpl fold; 347 InventoryFolderImpl fold;
340 if ((fold = libraryRoot.FindFolder(folderID)) != null) 348 if ((fold = LibraryRoot.FindFolder(folderID)) != null)
341 { 349 {
342 return fold.RequestListOfItems(); 350 return fold.RequestListOfItems();
343 } 351 }
@@ -428,7 +436,7 @@ namespace OpenSim.Framework.Communications.Cache
428 436
429 public void HandleFetchInventory(IClientAPI remoteClient, UUID itemID, UUID ownerID) 437 public void HandleFetchInventory(IClientAPI remoteClient, UUID itemID, UUID ownerID)
430 { 438 {
431 if (ownerID == libraryRoot.Owner) 439 if (ownerID == LibraryRoot.Owner)
432 { 440 {
433 //Console.WriteLine("request info for library item"); 441 //Console.WriteLine("request info for library item");
434 442