Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

There are no grids that don't support links.

Browse Source 
Conflicts:
	indra/newview/llinventorybridge.cpp
This commit is contained in:
Inusaito Sayori
2015-08-01 19:10:56 -04:00
parent 383cd45432
commit 773a2a3855
7 changed files with 13 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llinventory/llinventory.cpp
View File

@@ -34,7 +34,6 @@
#include "llsd.h"
#include "message.h"
#include <boost/tokenizer.hpp>
#include "../newview/hippogridmanager.h"
#include "llsdutil.h"
@@ -545,10 +544,6 @@ BOOL LLInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32
S8 type;
msg->getS8Fast(block, _PREHASH_Type, type, block_num);
mType = static_cast<LLAssetType::EType>(type);
if (mType == LLAssetType::AT_LINK || mType == LLAssetType::AT_LINK_FOLDER)
{
gHippoGridManager->getConnectedGrid()->setSupportsInvLinks(true);
}
msg->getS8(block, "InvType", type, block_num);
mInventoryType = static_cast<LLInventoryType::EType>(type);
mPermissions.initMasks(mInventoryType);
@@ -1132,11 +1127,6 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd, bool is_new)
S8 type = (U8)sd[w].asInteger();
mType = static_cast<LLAssetType::EType>(type);
}
if (mType == LLAssetType::AT_LINK || mType == LLAssetType::AT_LINK_FOLDER)
{
gHippoGridManager->getConnectedGrid()->setSupportsInvLinks(true);
}
}
w = INV_INVENTORY_TYPE_LABEL;
if (sd.has(w))