diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-12-18 09:51:26 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-12-18 09:51:26 -0800 |
| commit | da60cc476a9586449728c5b507a5cc8354cdf611 (patch) | |
| tree | 07b4f50bd0c56c97e40771e920fdbc9bed44e37d /indra/newview/llinventorymodel.cpp | |
| parent | 2069891d736544da3c1460a5b63113b75fe7d61e (diff) | |
| parent | a3b3ad727f53aa280ffbcc1b61ccfbb48e988708 (diff) | |
Merge viewer-release 6.0.2
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 2b9607f7a2..a520e0171e 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -2368,7 +2368,11 @@ void LLInventoryModel::buildParentChildMap() } // FIXME note that updateServer() fails with protected // types, so this will not work as intended in that case. - cat->updateServer(TRUE); + // UpdateServer uses AIS, AIS cat move is not implemented yet + // cat->updateServer(TRUE); + + // MoveInventoryFolder message, intentionally per item + cat->updateParentOnServer(FALSE); catsp = getUnlockedCatArray(cat->getParentUUID()); if(catsp) { |