diff options
author | Jeff Ames | 2009-06-10 04:28:56 +0000 |
---|---|---|
committer | Jeff Ames | 2009-06-10 04:28:56 +0000 |
commit | a23d64dec1cbf88abc3c7e84664a683dee534e4a (patch) | |
tree | 7e85403f29839775209481ba7f6ee55aac56f209 /OpenSim/Framework/Communications | |
parent | Letting the Flotsam cache be enabled even when [AssetCache] section is missin... (diff) | |
download | opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.zip opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.gz opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.bz2 opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index cf6a798..5181bdaea 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -286,7 +286,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
286 | // Take all ther received items and put them into the folder tree heirarchy | 286 | // Take all ther received items and put them into the folder tree heirarchy |
287 | foreach (InventoryItemBase item in items) { | 287 | foreach (InventoryItemBase item in items) { |
288 | InventoryFolderImpl folder = resolvedFolders.ContainsKey(item.Folder) ? resolvedFolders[item.Folder] : null; | 288 | InventoryFolderImpl folder = resolvedFolders.ContainsKey(item.Folder) ? resolvedFolders[item.Folder] : null; |
289 | ItemReceive(item, folder ); | 289 | ItemReceive(item, folder); |
290 | } | 290 | } |
291 | } | 291 | } |
292 | catch (Exception e) | 292 | catch (Exception e) |
diff --git a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs index 8061c8f..f30d28b 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
64 | { | 64 | { |
65 | UserProfileData userProfile = new UserProfileData(); | 65 | UserProfileData userProfile = new UserProfileData(); |
66 | 66 | ||
67 | // userProfile.ID = new UUID( Util.GetHashGuid( uri.ToString(), AssetCache.AssetInfo.Secret )); | 67 | // userProfile.ID = new UUID(Util.GetHashGuid(uri.ToString(), AssetCache.AssetInfo.Secret)); |
68 | 68 | ||
69 | return userProfile; | 69 | return userProfile; |
70 | } | 70 | } |