diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatergltfasseteditor.cpp | 13 | ||||
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/indra/newview/llfloatergltfasseteditor.cpp b/indra/newview/llfloatergltfasseteditor.cpp index 13e0d36c35..d2cf24f1dd 100644 --- a/indra/newview/llfloatergltfasseteditor.cpp +++ b/indra/newview/llfloatergltfasseteditor.cpp @@ -54,7 +54,7 @@ LLFloaterGLTFAssetEditor::~LLFloaterGLTFAssetEditor() { if (mScroller) { - removeChild(mScroller); + mItemListPanel->removeChild(mScroller); delete mScroller; mScroller = NULL; } @@ -345,13 +345,15 @@ void LLFloaterGLTFAssetEditor::dirty() { if (!mObject || !mAsset || !mFolderRoot) { - closeFloater(); return; } if (LLSelectMgr::getInstance()->getSelection()->getObjectCount() > 1) { - closeFloater(); + if (getVisible()) + { + closeFloater(); + } return; } @@ -366,7 +368,10 @@ void LLFloaterGLTFAssetEditor::dirty() LLViewerObject* objectp = node->getObject(); if (mObject != objectp || !objectp->mGLTFAsset) { - closeFloater(); + if (getVisible()) + { + closeFloater(); + } return; } diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 17f968b921..70356e8e96 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -7194,7 +7194,7 @@ void dialog_refresh_all() panel_task_info->dirty(); } - LLFloaterGLTFAssetEditor * gltf_editor = LLFloaterReg::getTypedInstance<LLFloaterGLTFAssetEditor>("gltf_asset_editor"); + LLFloaterGLTFAssetEditor * gltf_editor = LLFloaterReg::findTypedInstance<LLFloaterGLTFAssetEditor>("gltf_asset_editor"); if (gltf_editor) { gltf_editor->dirty(); |