diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-07 13:59:40 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-07 13:59:40 -0500 |
| commit | 690f18c948003c9d14524da8cdf5b82da8227758 (patch) | |
| tree | ff35e520c853e3f0005eb6e3bd61e0c659e9194e /indra/newview/skins/default | |
| parent | 0de24f857ac359e04d7def2afa7d8efe5a4cef97 (diff) | |
| parent | 70f959f01e845b3a7b6211f82c20d0cbd6641c39 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_model_preview.xml | 14 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 6 |
2 files changed, 15 insertions, 5 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 dce55dae12..4677d014b8 100644 --- a/indra/newview/skins/default/xui/en/floater_model_preview.xml +++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml @@ -83,6 +83,20 @@ </text> </panel> + <check_box + height="16" + left_delta="0" + name="confirm_checkbox" + top_pad="15" + follows="bottom|left" + width="16" /> + + <text + height="30" + width="570" + word_wrap="true" + left_delta="25" + top_delta="0">I confirm that I have the appropriate rights to the material contained in this model. [secondlife:///app/floater/learn_more Learn more]</text> <text left="10" bottom="540" width="290" height="15" follows="bottom|left|right" name="status">[STATUS]</text> diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 40bf7bfed7..f5f6b990d1 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2098,11 +2098,7 @@ even though the user gets a free copy. label="Cylinder" name="Cylinder" value="Cylinder" /> - <combo_box.item - label="Mesh" - name="Mesh" - value="Mesh" /> - </combo_box> + </combo_box> </panel> <panel border="false" |