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

Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559

master
Ptolemy 2022-07-14 19:10:23 -07:00
parent d05ccd74d4 075049d02c
commit 015cebd2a4
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llinventorybridge.cpp
View File

@ -785,7 +785,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
if (obj)
{
if (obj->getType() != LLInventoryType::IT_CATEGORY)
if (obj->getType() != LLAssetType::AT_CATEGORY)
{
items.push_back(std::string("Copy Separator"));
}
@ -881,7 +881,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id,
}
}
if (obj->getType() != LLInventoryType::IT_CATEGORY)
if (obj->getType() != LLAssetType::AT_CATEGORY)
{
items.push_back(std::string("Paste Separator"));
}

2
indra/newview/llmaterialeditor.h
View File

@ -57,7 +57,7 @@ public:
void setFromGLTFMaterial(LLGLTFMaterial* mat);
void loadAsset();
void loadAsset() override;
static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status);

1
indra/newview/skins/default/xui/en/strings.xml
View File

@ -405,6 +405,7 @@ http://secondlife.com/support for help fixing this problem.
<string name="symbolic link">link</string>
<string name="symbolic folder link">folder link</string>
<string name="settings blob">settings</string>
<string name="render material">material</string>
<string name="mesh">mesh</string>
<!-- llvoavatar. Displayed in the avatar chat bubble -->