diff options
author | McCabe Maxsted | 2010-07-03 20:22:30 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-07-03 20:23:08 -0700 |
commit | a72ab74505d12a341edb4c2fa19d8f071b4277f9 (patch) | |
tree | 6ddfbbf173bd15ea7d07dd1cab17b6082f84a172 /linden/indra/newview/skins | |
parent | Fixed floater_login.xml missing from CMakeLists.txt (diff) | |
download | meta-impy-a72ab74505d12a341edb4c2fa19d8f071b4277f9.zip meta-impy-a72ab74505d12a341edb4c2fa19d8f071b4277f9.tar.gz meta-impy-a72ab74505d12a341edb4c2fa19d8f071b4277f9.tar.bz2 meta-impy-a72ab74505d12a341edb4c2fa19d8f071b4277f9.tar.xz |
Basic cleanup of the grid manager code
Diffstat (limited to 'linden/indra/newview/skins')
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml (renamed from linden/indra/newview/skins/default/xui/en-us/floater_login.xml) | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_login.xml b/linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml index 96e2aa3..401780f 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_login.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_grid_manager.xml | |||
@@ -1,7 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater can_close="false" can_drag_on_left="false" can_minimize="false" | 2 | <floater can_close="true" can_drag_on_left="false" can_minimize="false" |
3 | can_resize="true" height="400" min_height="400" min_width="600" | 3 | can_resize="true" height="400" min_height="400" min_width="600" |
4 | name="floater_login" title="plasticwuzhere" width="600"> | 4 | name="floater_login" title="Grid Manager" width="600"> |
5 | 5 | ||
6 | <!-- Grid Selector --> | 6 | <!-- Grid Selector --> |
7 | <text type="string" length="1" enabled="true" name="grid_selector_label" | 7 | <text type="string" length="1" enabled="true" name="grid_selector_label" |
@@ -244,14 +244,17 @@ | |||
244 | left="280" mouse_opaque="true" name="connect_btn" scale_image="TRUE" | 244 | left="280" mouse_opaque="true" name="connect_btn" scale_image="TRUE" |
245 | width="100" /> --> | 245 | width="100" /> --> |
246 | <button bottom="8" follows="right|bottom" font="SansSerif" halign="center" | 246 | <button bottom="8" follows="right|bottom" font="SansSerif" halign="center" |
247 | height="24" label="Ok" label_selected="Apply" left="280" | 247 | height="24" label="Apply" label_selected="Apply" left="-108" |
248 | mouse_opaque="true" name="btn_apply" scale_image="TRUE" width="100" /> | ||
249 | <button bottom="8" follows="right|bottom" font="SansSerif" halign="center" | ||
250 | height="24" label="Cancel" label_selected="Cancel" left_delta="-104" | ||
251 | mouse_opaque="true" name="btn_cancel" scale_image="TRUE" width="100" /> | ||
252 | <button bottom="8" follows="right|bottom" font="SansSerif" halign="center" | ||
253 | height="24" label="OK" label_selected="OK" left_delta="-104" | ||
248 | mouse_opaque="true" name="btn_ok" scale_image="TRUE" width="100" /> | 254 | mouse_opaque="true" name="btn_ok" scale_image="TRUE" width="100" /> |
249 | <button bottom="8" follows="right|bottom" font="SansSerif" halign="center" | 255 | <button bottom="8" follows="right|bottom" font="SansSerif" halign="center" |
250 | height="24" label="Apply" label_selected="Apply" left="385" | 256 | height="24" label="Clear" label_selected="Clear" left_delta="-104" |
251 | mouse_opaque="true" name="btn_apply" scale_image="TRUE" width="100" /> | 257 | mouse_opaque="true" name="btn_clear" scale_image="TRUE" width="100" /> |
252 | <button bottom="8" follows="right|bottom" font="SansSerif" halign="center" | ||
253 | height="24" label="Undo" label_selected="Undo" left="490" | ||
254 | mouse_opaque="true" name="btn_cancel" scale_image="TRUE" width="100" /> | ||
255 | <!-- | 258 | <!-- |
256 | <combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18" | 259 | <combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18" |
257 | left_delta="135" max_chars="40" mouse_opaque="true" | 260 | left_delta="135" max_chars="40" mouse_opaque="true" |