aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
authorJeff Ames2008-07-23 13:24:25 +0000
committerJeff Ames2008-07-23 13:24:25 +0000
commit80d8e2889e62d8900837d37a800a4eeaae5ffc5a (patch)
tree47bdf0f48ae8ace3bb7cd10ab91d91b52b96f80e /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
parentget rid of some LLQuaternion == null checks. Because LLQuaternion is (diff)
downloadopensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.zip
opensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.gz
opensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.bz2
opensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.xz
Update svn properties. Formatting cleanup. Remove a compiler warning.
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs28
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3fa26e4..7141e13 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4737,51 +4737,51 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4737 requestID = new LLUUID(transfer.TransferInfo.Params, 80); 4737 requestID = new LLUUID(transfer.TransferInfo.Params, 80);
4738 if (!(((Scene)m_scene).ExternalChecks.ExternalChecksBypassPermissions())) 4738 if (!(((Scene)m_scene).ExternalChecks.ExternalChecksBypassPermissions()))
4739 { 4739 {
4740 if(taskID != LLUUID.Zero) // Prim 4740 if (taskID != LLUUID.Zero) // Prim
4741 { 4741 {
4742 SceneObjectPart part = ((Scene)m_scene).GetSceneObjectPart(taskID); 4742 SceneObjectPart part = ((Scene)m_scene).GetSceneObjectPart(taskID);
4743 if(part == null) 4743 if (part == null)
4744 break; 4744 break;
4745 4745
4746 if(part.OwnerID != AgentId) 4746 if (part.OwnerID != AgentId)
4747 break; 4747 break;
4748 4748
4749 if((part.OwnerMask & (uint)PermissionMask.Modify) == 0) 4749 if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
4750 break; 4750 break;
4751 4751
4752 TaskInventoryItem ti = part.GetInventoryItem(itemID); 4752 TaskInventoryItem ti = part.GetInventoryItem(itemID);
4753 if(ti == null) 4753 if (ti == null)
4754 break; 4754 break;
4755 4755
4756 if(ti.OwnerID != AgentId) 4756 if (ti.OwnerID != AgentId)
4757 break; 4757 break;
4758 4758
4759 if((ti.OwnerMask & ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) != ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) 4759 if ((ti.OwnerMask & ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) != ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
4760 break; 4760 break;
4761 4761
4762 if(ti.AssetID != requestID) 4762 if (ti.AssetID != requestID)
4763 break; 4763 break;
4764 } 4764 }
4765 else // Agent 4765 else // Agent
4766 { 4766 {
4767 CachedUserInfo userInfo = ((Scene)m_scene).CommsManager.UserProfileCacheService.GetUserDetails(AgentId); 4767 CachedUserInfo userInfo = ((Scene)m_scene).CommsManager.UserProfileCacheService.GetUserDetails(AgentId);
4768 if(userInfo == null) 4768 if (userInfo == null)
4769 break; 4769 break;
4770 4770
4771 if(userInfo.RootFolder == null) 4771 if (userInfo.RootFolder == null)
4772 break; 4772 break;
4773 4773
4774 InventoryItemBase assetRequestItem = userInfo.RootFolder.FindItem(itemID); 4774 InventoryItemBase assetRequestItem = userInfo.RootFolder.FindItem(itemID);
4775 if(assetRequestItem == null) 4775 if (assetRequestItem == null)
4776 { 4776 {
4777 assetRequestItem = ((Scene)m_scene).CommsManager.UserProfileCacheService.libraryRoot.FindItem(itemID); 4777 assetRequestItem = ((Scene)m_scene).CommsManager.UserProfileCacheService.libraryRoot.FindItem(itemID);
4778 if(assetRequestItem == null) 4778 if (assetRequestItem == null)
4779 return; 4779 return;
4780 } 4780 }
4781 4781
4782 if((assetRequestItem.CurrentPermissions & ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) != ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) 4782 if ((assetRequestItem.CurrentPermissions & ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) != ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
4783 break; 4783 break;
4784 if(assetRequestItem.AssetID != requestID) 4784 if (assetRequestItem.AssetID != requestID)
4785 break; 4785 break;
4786 } 4786 }
4787 } 4787 }