livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

meow-7.2.2
Kitty Barnett 2021-02-14 22:27:23 +01:00
parent 0884b0ec4a 719158dac4
commit f7df3d6194
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autobuild.xml
View File

@ -22,9 +22,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>aa31ee4c6315cb26bf6e2191b69598f5</string>
<string>1f887cbafc0fe2af1e85783de0f14102</string>
<key>url</key>
<string>http://3p.firestormviewer.org/jemalloc-5.1.0-linux64-190582149.tar.bz2</string>
<string>http://3p.firestormviewer.org/jemalloc-5.2.1-linux64-210451204.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>

8
indra/newview/llinventorymodel.cpp
View File

@ -1061,13 +1061,7 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask)
LLUUID new_parent_id = item->getParentUUID();
bool update_parent_on_server = false;
// if (new_parent_id.isNull() && !LLApp::isExiting())
// [SL:KB] - Patch: Appearance-Misc | Checked: Catznip-6.4
// The problem seems to be the 'LogoutReply' message so don't reparent anything to the LNF folder
// as soon as we've sent out the log out request (since the quitting state is only set >after< we
// start processing the logout response)
if ( (new_parent_id.isNull()) && (!LLAppViewer::instance()->logoutRequestSent()) && (!LLApp::isExiting()) )
// [/SL:KB]
if (new_parent_id.isNull() && !LLApp::isExiting())
{
if (old_parent_id.isNull())
{