Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 3 insertions, 4 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index ecf10e4..99552f1 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -7614,13 +7614,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
                         if (invAccess != null)
                         {
-                            if (!invAccess.GetAgentInventoryItem(this, itemID, requestID))
+                            if (!invAccess.CanGetAgentInventoryItem(this, itemID, requestID))
                                 return false;
-
                         }
                         else
+                        {
                             return false;
-
+                        }
                     }
                 }
             }
@@ -7634,7 +7634,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
 
-
             // m_log.Debug("upload request " + request.ToString());
             // m_log.Debug("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString());
             UUID temp = UUID.Combine(request.AssetBlock.TransactionID, SecureSessionId);