diff options
| author | Melanie | 2012-03-20 23:39:02 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-20 23:39:02 +0000 |
| commit | 35c3124c3badfc7c6e3b0ee1957cb827be678650 (patch) | |
| tree | e245c0080da5acc0b9192208d0a421be865ba2cb /OpenSim/Region/ClientStack/Linden/Caps | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add prim name to "[MESH]: No recognized physics mesh..." log message (diff) | |
| download | opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.zip opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.gz opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.bz2 opensim-SC_OLD-35c3124c3badfc7c6e3b0ee1957cb827be678650.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 6c44175..0103761 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -771,7 +771,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 771 | SceneObjectPart part = m_Scene.GetSceneObjectPart(objectID); | 771 | SceneObjectPart part = m_Scene.GetSceneObjectPart(objectID); |
| 772 | if (part != null) | 772 | if (part != null) |
| 773 | { | 773 | { |
| 774 | TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(notecardID); | 774 | // TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(notecardID); |
| 775 | if (!m_Scene.Permissions.CanCopyObjectInventory(notecardID, objectID, m_HostCapsObj.AgentID)) | 775 | if (!m_Scene.Permissions.CanCopyObjectInventory(notecardID, objectID, m_HostCapsObj.AgentID)) |
| 776 | { | 776 | { |
| 777 | return LLSDHelpers.SerialiseLLSDReply(response); | 777 | return LLSDHelpers.SerialiseLLSDReply(response); |