summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatergltfasseteditor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloatergltfasseteditor.cpp')
-rw-r--r--indra/newview/llfloatergltfasseteditor.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/indra/newview/llfloatergltfasseteditor.cpp b/indra/newview/llfloatergltfasseteditor.cpp
index ec9ccc1324..f21b8032d0 100644
--- a/indra/newview/llfloatergltfasseteditor.cpp
+++ b/indra/newview/llfloatergltfasseteditor.cpp
@@ -3,9 +3,9 @@
* @author Andrii Kleshchev
* @brief LLFloaterGltfAssetEditor class implementation
*
- * $LicenseInfo:firstyear=2008&license=viewerlgpl$
+ * $LicenseInfo:firstyear=2024&license=viewerlgpl$
* Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * Copyright (C) 2024, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -251,7 +251,8 @@ void LLFloaterGLTFAssetEditor::loadFromSelection()
return;
}
- LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+ LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstNode(NULL);
+ LLViewerObject* objectp = node->getObject();
if (!objectp)
{
return;
@@ -263,6 +264,15 @@ void LLFloaterGLTFAssetEditor::loadFromSelection()
return;
}
+ if (node->mName.empty())
+ {
+ setTitle(getString("floater_title"));
+ }
+ else
+ {
+ setTitle(node->mName);
+ }
+
LLUIColor item_color = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
for (S32 i = 0; i < mAsset->mScenes.size(); i++)
{