summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-09-22 03:04:21 -0500
committerDave Parks <davep@lindenlab.com>2010-09-22 03:04:21 -0500
commitcf09d6c58a741263cddcf338c2f79836873475b1 (patch)
tree38c5adaf911371f72176485d0ddf13f029cee431 /indra/newview/skins/default
parent7d625ef060c9916268c479ab817b24ac1d23199f (diff)
Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater.
Diffstat (limited to 'indra/newview/skins/default')
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_tools.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index bd07c473de..6b2b5d7d7e 100755
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2163,6 +2163,10 @@ 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>
</panel>
<panel