diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-12-13 15:52:44 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-12-13 15:52:44 -0800 |
| commit | 56d9d204f76978bf1373e15c84649a87d40dd16d (patch) | |
| tree | c55324326ee8c8b05419d27b49f0b89aa63cd85a /indra/newview/llinventorymodel.cpp | |
| parent | 9475a593a170f0c90a8d353de3e1277f844ee913 (diff) | |
| parent | a3b3ad727f53aa280ffbcc1b61ccfbb48e988708 (diff) | |
Merge
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 1c6d9fba9d..6046fbf2ab 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) { |