diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2022-07-14 19:10:23 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2022-07-14 19:10:23 -0700 |
| commit | 015cebd2a4d29dba883e06fe93065bee98f7f9c9 (patch) | |
| tree | 2531a67ad98078c832fa79fd43bc807095030318 /indra | |
| parent | d05ccd74d44b595d02d6032c9ed2c0f9ff21f5f0 (diff) | |
| parent | 075049d02c6e86eaf25cbe67556207247627a5e8 (diff) | |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llmaterialeditor.h | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index d325831c8f..03c6996de6 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -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")); } diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h index dd0a17976c..6196e3d310 100644 --- a/indra/newview/llmaterialeditor.h +++ b/indra/newview/llmaterialeditor.h @@ -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); diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e89e03dafa..4169929be8 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -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 --> |