diff options
Diffstat (limited to 'OpenSim/Framework/Communications/CommunicationsManager.cs')
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 9 |
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 | |||
112 | /// <param name="assetCache"></param> | 112 | /// <param name="assetCache"></param> |
113 | /// <param name="dumpAssetsToFile"></param> | 113 | /// <param name="dumpAssetsToFile"></param> |
114 | public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, | 114 | public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache, |
115 | bool dumpAssetsToFile) | 115 | bool dumpAssetsToFile, LibraryRootFolder libraryRootFolder) |
116 | { | 116 | { |
117 | m_networkServersInfo = serversInfo; | 117 | m_networkServersInfo = serversInfo; |
118 | m_assetCache = assetCache; | 118 | m_assetCache = assetCache; |
119 | m_userProfileCacheService = new UserProfileCacheService(this); | 119 | m_userProfileCacheService = new UserProfileCacheService(this, libraryRootFolder); |
120 | // m_transactionsManager = new AgentAssetTransactionsManager(this, dumpAssetsToFile); | 120 | // m_transactionsManager = new AgentAssetTransactionsManager(this, dumpAssetsToFile); |
121 | } | 121 | } |
122 | 122 | ||
@@ -356,7 +356,7 @@ namespace OpenSim.Framework.Communications | |||
356 | 356 | ||
357 | public void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client) | 357 | public void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client) |
358 | { | 358 | { |
359 | if (uuid == m_userProfileCacheService.libraryRoot.Owner) | 359 | if (uuid == m_userProfileCacheService.LibraryRoot.Owner) |
360 | { | 360 | { |
361 | remote_client.SendNameReply(uuid, "Mr", "OpenSim"); | 361 | remote_client.SendNameReply(uuid, "Mr", "OpenSim"); |
362 | } | 362 | } |
@@ -376,7 +376,6 @@ namespace OpenSim.Framework.Communications | |||
376 | string[] returnstring = new string[0]; | 376 | string[] returnstring = new string[0]; |
377 | bool doLookup = false; | 377 | bool doLookup = false; |
378 | 378 | ||
379 | |||
380 | lock (m_nameRequestCache) | 379 | lock (m_nameRequestCache) |
381 | { | 380 | { |
382 | if (m_nameRequestCache.ContainsKey(uuid)) | 381 | if (m_nameRequestCache.ContainsKey(uuid)) |
@@ -405,8 +404,8 @@ namespace OpenSim.Framework.Communications | |||
405 | } | 404 | } |
406 | } | 405 | } |
407 | } | 406 | } |
407 | |||
408 | return returnstring; | 408 | return returnstring; |
409 | |||
410 | } | 409 | } |
411 | 410 | ||
412 | public bool UUIDNameCachedTest(UUID uuid) | 411 | public bool UUIDNameCachedTest(UUID uuid) |