diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-22 18:54:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-22 18:54:09 +0300 |
| commit | dc2aab4ee42e4e7ecf14d475b803446fee422cbb (patch) | |
| tree | e69eb8ce7fb2857ba24c348b7b738fd962591e4b /indra/newview/llinventorybridge.cpp | |
| parent | 75fb5c0d5e54c36327cfdca17e6ccc1682743fe0 (diff) | |
| parent | 15877bf396f1b37784a8449540335960190862d0 (diff) | |
Merge pull request #2085 from RyeMutt/crash-fixes
Fix various nullptr crashes
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index e40ab86010..8f3dc3ce16 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -961,7 +961,7 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, } } - if (obj->getType() != LLAssetType::AT_CATEGORY) + if (obj && obj->getType() != LLAssetType::AT_CATEGORY) { items.push_back(std::string("Paste Separator")); } |