diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-07-01 19:01:20 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-07-01 20:05:31 +0300 |
| commit | b940fbc0d4b78534780de33dc9f7d41535de5ae3 (patch) | |
| tree | 720ec150b77241eb91e4bdc30b8e230fdc60dbd7 /indra/newview/llfloatergltfasseteditor.cpp | |
| parent | 279ec534dd999420544b672cf84841b86d1306ae (diff) | |
viewer#1131 MacOS build fixes and small adjustments
Diffstat (limited to 'indra/newview/llfloatergltfasseteditor.cpp')
| -rw-r--r-- | indra/newview/llfloatergltfasseteditor.cpp | 16 |
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++) { |