diff options
| author | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-15 00:23:36 +0200 |
|---|---|---|
| committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-15 00:23:36 +0200 |
| commit | 49630f6bf56db8b2561d99cd71cfcf2b7bee9f90 (patch) | |
| tree | 2b44d1dde9392cf2e5eaa9cb60d2033f0d9bc355 /indra/newview/llpanellandmarks.cpp | |
| parent | 079ad3b5767c444a29f97ca2e6b27fdb28f4b116 (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanellandmarks.cpp')
| -rwxr-xr-x | indra/newview/llpanellandmarks.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index 75a3584a1e..1d73d4bd6e 100755 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -1173,7 +1173,8 @@ bool LLLandmarksPanel::canItemBeModified(const std::string& command_name, LLFold if ("copy" == command_name) { - return root_folder->canCopy(); + // we shouldn't be able to copy folders from My Inventory Panel + return can_be_modified && root_folder->canCopy(); } else if ("collapse" == command_name) { |