summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-12-03 01:46:26 +0100
committerKitty Barnett <develop@catznip.com>2012-12-03 01:46:26 +0100
commit1e26dbdcd27a1f29fe249cc7e074e5ede284bac8 (patch)
tree8580d1b1919b5b350adea0480aa88e7569bd78cc /indra/newview/skins/default/xui
parenta0392ec5ec5703bd54bc4e091820d1c1423bbad4 (diff)
Started LLMaterialMgr to handle viewer<->region materials communication
* refactored LLFloaterDebugMaterials::requestPutMaterials() to use LLMaterialMgr instead * replaced "Object editing" results list with information about the active selection instead
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_debug_materials.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_debug_materials.xml b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
index b6c105e19a..3a450fdeff 100644
--- a/indra/newview/skins/default/xui/en/floater_debug_materials.xml
+++ b/indra/newview/skins/default/xui/en/floater_debug_materials.xml
@@ -720,24 +720,24 @@
left="0"
top_pad="0"
width="160">
- Results
+ Active selection
</text>
<scroll_list
column_padding="0"
draw_heading="true"
follows="left|top|right"
- height="100"
+ height="300"
layout="topleft"
left="0"
top_pad="10"
tab_stop="false"
multi_select="true"
name="put_scroll_list"
- width="400">
+ width="600">
<scroll_list.columns
label="Object ID"
name="object_id"
- width="80" />
+ width="225" />
<scroll_list.columns
label="Face Index"
name="face_index"