diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2022-07-29 12:08:31 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2022-07-29 12:08:31 -0400 |
| commit | eaebe8fe70985f6d25cf883867f19617164ead81 (patch) | |
| tree | aee58dc2b413b301a72327a00e57a2be8e55129d /indra/newview | |
| parent | 206d8a0e3124caee7778c9a1e1d44a9aaa4150de (diff) | |
DRTVWR-559: Revert "Fix minor Mac build issues."
Somehow this commit got into my local repository without showing up as a new
commit relative to bitbucket. Try double-reverting it. This is the first one.
This reverts commit 7772b5639a9bae2c4fbbcd2575355404c4bdca55.
Diffstat (limited to 'indra/newview')
| -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 03c6996de6..d325831c8f 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() != LLAssetType::AT_CATEGORY) + if (obj->getType() != LLInventoryType::IT_CATEGORY) { items.push_back(std::string("Copy Separator")); } @@ -881,7 +881,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, } } - if (obj->getType() != LLAssetType::AT_CATEGORY) + if (obj->getType() != LLInventoryType::IT_CATEGORY) { items.push_back(std::string("Paste Separator")); } diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h index 3da59c7f93..4df991be39 100644 --- a/indra/newview/llmaterialeditor.h +++ b/indra/newview/llmaterialeditor.h @@ -57,7 +57,7 @@ public: void setFromGLTFMaterial(LLGLTFMaterial* mat); - void loadAsset() override; + void loadAsset(); static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); |