diff options
author | Diva Canto | 2009-08-13 11:30:29 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-13 11:30:29 -0700 |
commit | 6b9cc6c48d7b49cc4bce5dce4e66d7856a093b75 (patch) | |
tree | 82b2f99cb17b12d2bae173e33065170200b49eae /OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-6b9cc6c48d7b49cc4bce5dce4e66d7856a093b75.zip opensim-SC_OLD-6b9cc6c48d7b49cc4bce5dce4e66d7856a093b75.tar.gz opensim-SC_OLD-6b9cc6c48d7b49cc4bce5dce4e66d7856a093b75.tar.bz2 opensim-SC_OLD-6b9cc6c48d7b49cc4bce5dce4e66d7856a093b75.tar.xz |
Inventory redirects from CachedUserInfo to InventoryService COMPLETE!
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs index fa5369f..956dd10 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs | |||
@@ -37,6 +37,7 @@ using OpenSim.Framework.Communications.Cache; | |||
37 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>; | 39 | using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>; |
40 | using OpenSim.Services.Interfaces; | ||
40 | 41 | ||
41 | namespace OpenSim.Region.CoreModules.Agent.TextureDownload | 42 | namespace OpenSim.Region.CoreModules.Agent.TextureDownload |
42 | { | 43 | { |
@@ -217,7 +218,8 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload | |||
217 | if (profile == null) // Deny unknown user | 218 | if (profile == null) // Deny unknown user |
218 | return; | 219 | return; |
219 | 220 | ||
220 | if (profile.RootFolder == null) // Deny no inventory | 221 | IInventoryService invService = scene.InventoryService; |
222 | if (invService.GetRootFolder(client.AgentId) == null) // Deny no inventory | ||
221 | return; | 223 | return; |
222 | 224 | ||
223 | if (profile.UserProfile.GodLevel < 200 && profile.RootFolder.FindAsset(e.RequestedAssetID) == null) // Deny if not owned | 225 | if (profile.UserProfile.GodLevel < 200 && profile.RootFolder.FindAsset(e.RequestedAssetID) == null) // Deny if not owned |