diff options
author | Richard Linden <none@none> | 2013-01-04 16:46:25 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-01-04 16:46:25 -0800 |
commit | 0d8f1077a62099915cb532dc354d0e450e3e6a79 (patch) | |
tree | f76f43d025304bc6aa65d3f91663cac67a6715cc /indra/newview/llinventoryfunctions.cpp | |
parent | 0d12d171cf20c63a45e7ad0989e65d05aabb86ea (diff) | |
parent | 7dbb8860373769dfca7d6c6588284866a1bf86a3 (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
-rw-r--r-- | indra/newview/llinventoryfunctions.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index e98d3f88a6..68732024de 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -959,7 +959,6 @@ void LLSaveFolderState::setApply(BOOL apply) void LLSaveFolderState::doFolder(LLFolderViewFolder* folder) { - LLMemType mt(LLMemType::MTYPE_INVENTORY_DO_FOLDER); LLInvFVBridge* bridge = (LLInvFVBridge*)folder->getListener(); if(!bridge) return; |