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/llviewerwindow.cpp | |
| parent | 75fb5c0d5e54c36327cfdca17e6ccc1682743fe0 (diff) | |
| parent | 15877bf396f1b37784a8449540335960190862d0 (diff) | |
Merge pull request #2085 from RyeMutt/crash-fixes
Fix various nullptr crashes
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 2869c53992..9dc12c4856 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1271,7 +1271,7 @@ LLWindowCallbacks::DragNDropResult LLViewerWindow::handleDragNDrop( LLWindow *wi LLTextureEntry *te = obj->getTE(object_face); // can modify URL if we can modify the object or we have navigate permissions - bool allow_modify_url = obj->permModify() || obj->hasMediaPermission( te->getMediaData(), LLVOVolume::MEDIA_PERM_INTERACT ); + bool allow_modify_url = obj->permModify() || (te && obj->hasMediaPermission( te->getMediaData(), LLVOVolume::MEDIA_PERM_INTERACT )); if (te && allow_modify_url ) { |