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 | |
parent | 279ec534dd999420544b672cf84841b86d1306ae (diff) |
viewer#1131 MacOS build fixes and small adjustments
-rw-r--r-- | indra/newview/llfloatergltfasseteditor.cpp | 16 | ||||
-rw-r--r-- | indra/newview/llfloatergltfasseteditor.h | 2 | ||||
-rw-r--r-- | indra/newview/llgltffolderitem.cpp | 4 | ||||
-rw-r--r-- | indra/newview/llgltffolderitem.h | 10 | ||||
-rw-r--r-- | indra/newview/llgltffoldermodel.cpp | 4 | ||||
-rw-r--r-- | indra/newview/llgltffoldermodel.h | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml | 7 |
7 files changed, 28 insertions, 17 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++) { diff --git a/indra/newview/llfloatergltfasseteditor.h b/indra/newview/llfloatergltfasseteditor.h index 8164928824..e35ed30ed0 100644 --- a/indra/newview/llfloatergltfasseteditor.h +++ b/indra/newview/llfloatergltfasseteditor.h @@ -98,4 +98,4 @@ private: LLSpinCtrl* mCtrlRotZ = nullptr; }; -#endif LL_LLFLOATERGLTFASSETEDITOR_H +#endif diff --git a/indra/newview/llgltffolderitem.cpp b/indra/newview/llgltffolderitem.cpp index c4fcb4f5ce..77a19c060d 100644 --- a/indra/newview/llgltffolderitem.cpp +++ b/indra/newview/llgltffolderitem.cpp @@ -3,9 +3,9 @@ * @author Andrey Kleshchev * @brief LLGLTFFolderItem 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 diff --git a/indra/newview/llgltffolderitem.h b/indra/newview/llgltffolderitem.h index 83c6449f96..89d90c81cc 100644 --- a/indra/newview/llgltffolderitem.h +++ b/indra/newview/llgltffolderitem.h @@ -59,8 +59,8 @@ public: std::string getSearchableUUIDString() const override { return std::string(); } LLPointer<LLUIImage> getIcon() const override { return pIcon; } - LLPointer<LLUIImage> getIconOpen() const { return getIcon(); } - LLPointer<LLUIImage> getIconOverlay() const { return NULL; } + LLPointer<LLUIImage> getIconOpen() const override { return getIcon(); } + LLPointer<LLUIImage> getIconOverlay() const override { return NULL; } LLFontGL::StyleFlags getLabelStyle() const override { return LLFontGL::NORMAL; } std::string getLabelSuffix() const override { return std::string(); } @@ -71,7 +71,7 @@ public: void navigateToFolder(bool new_window = false, bool change_mode = false) override {} - bool isItemWearable() const { return false; } + bool isItemWearable() const override { return false; } bool isItemRenameable() const override { return false; } bool renameItem(const std::string& new_name) override { return false; } @@ -86,7 +86,7 @@ public: bool isItemCopyable(bool can_copy_as_link = true) const override { return false; } bool copyToClipboard() const override { return false; } bool cutToClipboard() override { return false; } - bool isCutToClipboard() { return false; } + bool isCutToClipboard() override { return false; } bool isClipboardPasteable() const override { return false; } void pasteFromClipboard() override {} @@ -125,4 +125,4 @@ private: S32 mItemId = -1; }; -#endif LL_LLGLTFFOLDERITEM_H +#endif diff --git a/indra/newview/llgltffoldermodel.cpp b/indra/newview/llgltffoldermodel.cpp index 5f22c8b710..de2510dc4a 100644 --- a/indra/newview/llgltffoldermodel.cpp +++ b/indra/newview/llgltffoldermodel.cpp @@ -3,9 +3,9 @@ * @author Andrey Kleshchev * @brief gltf model's folder structure related classes * - * $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 diff --git a/indra/newview/llgltffoldermodel.h b/indra/newview/llgltffoldermodel.h index 26f05d1ecd..69b284aa31 100644 --- a/indra/newview/llgltffoldermodel.h +++ b/indra/newview/llgltffoldermodel.h @@ -88,4 +88,4 @@ public: private: }; -#endif LL_LLGLTFFOLDERMODEL_H +#endif diff --git a/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml index 82e0e325fb..b17d0aa5b6 100644 --- a/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_gltf_asset_editor.xml @@ -10,6 +10,7 @@ layout="topleft" name="gltf asset editor" title="[OBJECT_NAME]"> + <floater.string name="floater_title" value="GLTF Scene Editor"/> <floater.string name="scene_tittle" value="Scene"/> <floater.string name="node_tittle" value="Node"/> <floater.string name="mesh_tittle" value="Mesh"/> @@ -39,7 +40,7 @@ name="item_list_panel" visible="true" bottom="-1" - top="16" + top="1" left="5" right="-1"/> </layout_panel> @@ -60,8 +61,8 @@ image_selected="ClipboardSmallMenu_Press" image_unselected="ClipboardSmallMenu_Off" layout="topleft" - left_delta="0" - top_pad="13" + left="4" + top="10" name="clipboard_pos_btn" tool_tip="Paste options" width="19"/> |