diff options
author | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
commit | c880c961bb2a0838bc529efc07cfeb12f5636d88 (patch) | |
tree | beff6cda58f68c5d95277cf77957dc96c2a79dfd /indra/newview/llinventoryfunctions.cpp | |
parent | 841dc5da2ef9626fa4ab9255681d217df62a6b0b (diff) | |
parent | e87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff) |
merge changes for 3.4.5
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; |