summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorHoward Stearns <aech@lindenlab.com>2022-03-10 01:02:41 +0000
committerHoward Stearns <aech@lindenlab.com>2022-03-10 01:02:41 +0000
commit31c61b9890e761e8dce699a30ddb72461adb2415 (patch)
tree8e285d83db53be65e0ea717446a5b8e4a87ec316 /indra/newview/skins
parent0e927e92f33f4a421a3cd56f7b9bc65c19003df2 (diff)
parent7f8236140266bb1f057333b3f0f8f2ea30e1aef0 (diff)
Merged in SL-9748 (pull request #884)
SL-9748 - Option to compute uploaded mesh physics shape from a cube. Approved-by: Andrey Kleshchev
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_model_preview.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index f4cf2cb512..96cb7c8641 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -784,6 +784,7 @@
<combo_item name="physics_medium"> Medium </combo_item>
<combo_item name="physics_low"> Low </combo_item>
<combo_item name="physics_lowest"> Lowest </combo_item>
+ <combo_item name="physics_bounding_box"> Bounding Box </combo_item>
<combo_item name="load_from_file"> From file </combo_item>
</combo_box>
<line_editor