diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-07-29 12:10:05 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-07-29 12:10:05 -0400 |
| commit | 842ed39584b3df814c290931d750a1bf3b982cf3 (patch) | |
| tree | 292b6c7558adbe914145a4bd802a0cd9062e9578 | |
| parent | eaebe8fe70985f6d25cf883867f19617164ead81 (diff) | |
DRTVWR-559: Revert "Revert "Fix minor Mac build issues.""
Try to reapply the original commit in such a way that it can be pushed.
This reverts commit eaebe8fe70985f6d25cf883867f19617164ead81.
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llmaterialeditor.h | 2 |
2 files changed, 3 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 4df991be39..3da59c7f93 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); |