diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-05-28 09:45:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-28 09:45:40 -0500 |
| commit | 2f4120038429c6aff865f153f708ceefb60d67f4 (patch) | |
| tree | 85e63488eb66760996fd2e0c55c40fdc7b5b38b3 /indra/newview/skins/default | |
| parent | db627bc3544b828982a2a366972e0adf86e42f75 (diff) | |
Remove tinygltf dependency from LL::GLTF (#1541)
* #1535 Image loading/saving support in boost::json driven GLTF parser
* #1536 GLB Support in boost::json drvien GLTF parser
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 22 |
2 files changed, 22 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 8c9561fe64..daf8dd4208 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2880,14 +2880,6 @@ function="World.EnvPreset" function="Advanced.ClickGLTFSaveAs" /> </menu_item_call> <menu_item_call - label="Decompose..." - name="Decompose..."> - <menu_item_call.on_enable - function="EnableGLTF"/> - <menu_item_call.on_click - function="Advanced.ClickGLTFDecompose" /> - </menu_item_call> - <menu_item_call label="Upload..." name="Upload..."> <menu_item_call.on_enable diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index e3b9f744e9..1584de6880 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -12472,6 +12472,28 @@ are wearing now. <notification icon="alertmodal.tga" + name="GLTFLoadFailed" + type="alert"> + Failed to load GLTF file. See log for details. + <tag>fail</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" + name="GLTFSaveFailed" + type="alert"> + Failed to save GLTF file. See log for details. + <tag>fail</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + + <notification + icon="alertmodal.tga" name="GLTFSaveSelection" type="alert"> You must select an object that has a GLTF asset associated with it. |