aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorlbsa712007-11-01 19:19:05 +0000
committerlbsa712007-11-01 19:19:05 +0000
commit4fad66f855544b9298ae2216c58c0f44009358a5 (patch)
tree07747305928e0072230b31c399d8a7e76442b77f /OpenSim/Framework/Communications
parentPartialy fixed a bug with collisions in BulletXPlugin. (diff)
downloadopensim-SC_OLD-4fad66f855544b9298ae2216c58c0f44009358a5.zip
opensim-SC_OLD-4fad66f855544b9298ae2216c58c0f44009358a5.tar.gz
opensim-SC_OLD-4fad66f855544b9298ae2216c58c0f44009358a5.tar.bz2
opensim-SC_OLD-4fad66f855544b9298ae2216c58c0f44009358a5.tar.xz
* Diuerse beavtificatems
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs4
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCache.cs6
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 6222649..6be0852 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -52,10 +52,10 @@ namespace OpenSim.Framework.Communications.Cache
52 public List<AssetRequest> TextureRequests = new List<AssetRequest>(); //textures ready to be sent 52 public List<AssetRequest> TextureRequests = new List<AssetRequest>(); //textures ready to be sent
53 53
54 public Dictionary<LLUUID, AssetRequest> RequestedAssets = new Dictionary<LLUUID, AssetRequest>(); 54 public Dictionary<LLUUID, AssetRequest> RequestedAssets = new Dictionary<LLUUID, AssetRequest>();
55 //Assets requested from the asset server 55 //Assets requested from the asset server
56 56
57 public Dictionary<LLUUID, AssetRequest> RequestedTextures = new Dictionary<LLUUID, AssetRequest>(); 57 public Dictionary<LLUUID, AssetRequest> RequestedTextures = new Dictionary<LLUUID, AssetRequest>();
58 //Textures requested from the asset server 58 //Textures requested from the asset server
59 59
60 public Dictionary<LLUUID, TextureSender> SendingTextures = new Dictionary<LLUUID, TextureSender>(); 60 public Dictionary<LLUUID, TextureSender> SendingTextures = new Dictionary<LLUUID, TextureSender>();
61 private BlockingQueue<TextureSender> QueueTextures = new BlockingQueue<TextureSender>(); 61 private BlockingQueue<TextureSender> QueueTextures = new BlockingQueue<TextureSender>();
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
index ccf5024..74b2440 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Framework.Communications.Cache
90 { 90 {
91 InventoryFolderImpl createdFolder = 91 InventoryFolderImpl createdFolder =
92 userProfile.RootFolder.CreateNewSubFolder(folderID, folderName, folderType); 92 userProfile.RootFolder.CreateNewSubFolder(folderID, folderName, folderType);
93 93
94 if (createdFolder != null) 94 if (createdFolder != null)
95 { 95 {
96 m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdFolder); 96 m_parent.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdFolder);
@@ -119,7 +119,7 @@ namespace OpenSim.Framework.Communications.Cache
119 119
120 return; 120 return;
121 } 121 }
122 122
123 if ((fold = libraryRoot.HasSubFolder(folderID)) != null) 123 if ((fold = libraryRoot.HasSubFolder(folderID)) != null)
124 { 124 {
125 remoteClient.SendInventoryFolderDetails(libraryRoot.agentID, folderID, fold.RequestListOfItems()); 125 remoteClient.SendInventoryFolderDetails(libraryRoot.agentID, folderID, fold.RequestListOfItems());
@@ -129,7 +129,7 @@ namespace OpenSim.Framework.Communications.Cache
129 129
130 CachedUserInfo userProfile; 130 CachedUserInfo userProfile;
131 if (m_userProfiles.TryGetValue(remoteClient.AgentId, out userProfile)) 131 if (m_userProfiles.TryGetValue(remoteClient.AgentId, out userProfile))
132 { 132 {
133 if (userProfile.RootFolder != null) 133 if (userProfile.RootFolder != null)
134 { 134 {
135 if (userProfile.RootFolder.folderID == folderID) 135 if (userProfile.RootFolder.folderID == folderID)