summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-10-09 19:10:04 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-10-09 19:10:04 +0300
commit8b72d66c3b518dcc6325d3cc09bced97a83af891 (patch)
tree52d50ac2298da61b31e0564341b8920f029d3e9f
parent2bee82a87655be0a0cd0830751cb6821190777d6 (diff)
SL-1043 Fixed Viewer inventory using unsupported method to relocate folders at startup
-rw-r--r--indra/newview/llinventorymodel.cpp6
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)
{