diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-24 09:33:58 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-24 09:33:58 +0300 |
commit | f32d3767dc6f0d4d831882135d2eb88ee96ba79d (patch) | |
tree | 21685bf5688d93ee583d6f7059fdf5ccb7cea5f2 /indra/newview/llinventorybridge.cpp | |
parent | 25e9c61eef179c7ad79d19261f72c1bc85a3ff1b (diff) | |
parent | 57e78ed43b61864a6b8a54df95d8823daaeb5fe8 (diff) |
Merge branch 'develop' into marchcat/b-develop
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 5a82d3b6f8..65acf8ea52 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")); } @@ -6307,7 +6307,7 @@ void LLCallingCardBridge::performAction(LLInventoryModel* model, std::string act if (item && (item->getCreatorUUID() != gAgent.getID()) && (!item->getCreatorUUID().isNull())) { - std::string callingcard_name = LLCacheName::getDefaultName(); + std::string callingcard_name = gCacheName->getDefaultName(); LLAvatarName av_name; if (LLAvatarNameCache::get(item->getCreatorUUID(), &av_name)) { |