summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-x[-rw-r--r--]indra/newview/installers/darwin/dmg-cleanup.applescript0
-rwxr-xr-xindra/newview/installers/darwin/fix_application_icon_position.sh14
-rw-r--r--indra/newview/llfloaterpreference.cpp2
-rw-r--r--indra/newview/skins/default/textures/textures.xml28
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml36
-rw-r--r--indra/newview/skins/default/xui/en/panel_navigation_bar.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml15
-rw-r--r--indra/newview/skins/default/xui/en/panel_status_bar.xml35
-rw-r--r--indra/newview/skins/default/xui/en/widgets/location_input.xml16
9 files changed, 70 insertions, 80 deletions
diff --git a/indra/newview/installers/darwin/dmg-cleanup.applescript b/indra/newview/installers/darwin/dmg-cleanup.applescript
index f3d39aec21..f3d39aec21 100644..100755
--- a/indra/newview/installers/darwin/dmg-cleanup.applescript
+++ b/indra/newview/installers/darwin/dmg-cleanup.applescript
diff --git a/indra/newview/installers/darwin/fix_application_icon_position.sh b/indra/newview/installers/darwin/fix_application_icon_position.sh
new file mode 100755
index 0000000000..a0b72a89f2
--- /dev/null
+++ b/indra/newview/installers/darwin/fix_application_icon_position.sh
@@ -0,0 +1,14 @@
+# just run this script each time after you change the installer's name to fix the icon misalignment
+#!/bin/bash
+cp -r ./../../../build-darwin-i386/newview/*.dmg ~/Desktop/TempBuild.dmg
+hdid ~/Desktop/TempBuild.dmg
+open -a finder /Volumes/Second\ Life\ Installer
+osascript dmg-cleanup.applescript
+cp /Volumes/Second\ Life\ Installer/.DS_Store ~/Desktop/_DS_Store
+chflags nohidden ~/Desktop/_DS_Store
+cp ~/Desktop/_DS_Store ./firstlook-dmg/_DS_Store
+cp ~/Desktop/_DS_Store ./publicnightly-dmg/_DS_Store
+cp ~/Desktop/_DS_Store ./release-dmg/_DS_Store
+cp ~/Desktop/_DS_Store ./releasecandidate-dmg/_DS_Store
+umount /Volumes/Second\ Life\ Installer/
+rm ~/Desktop/_DS_Store ~/Desktop/TempBuild.dmg
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index d0716f67b8..9af37e8174 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -602,8 +602,8 @@ void LLFloaterPreference::onBtnOK()
apply();
closeFloater(false);
- gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
LLUIColorTable::instance().saveUserSettings();
+ gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
// save all settings, even if equals defaults
gCrashSettings.saveToFile(crash_settings_filename, FALSE);
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index dab11149b9..ef6df7df1b 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -224,7 +224,7 @@ with the same filename but different name
scale.left="4" scale.top="28" scale.right="60" scale.bottom="4" />
<texture name="Inspector_Hover" file_name="windows/Inspector_Hover.png" preload="false" />
<texture name="Inspector_I" file_name="windows/Inspector_I.png" preload="false" />
-
+
<texture name="Inv_Acessories" file_name="icons/Inv_Accessories.png" preload="false" />
<texture name="Inv_Alpha" file_name="icons/Inv_Alpha.png" preload="false" />
<texture name="Inv_Animation" file_name="icons/Inv_Animation.png" preload="false" />
@@ -648,6 +648,12 @@ with the same filename but different name
<texture name="PowerOff_Over" file_name="icons/PowerOff_Over.png" preload="false" />
<texture name="PowerOff_Press" file_name="icons/PowerOff_Press.png" preload="false" />
+ <texture name="pixiesmall.j2c" use_mips="true" />
+ <texture name="script_error.j2c" use_mips="true" />
+ <texture name="silhouette.j2c" use_mips="true" />
+ <texture name="foot_shadow.j2c" use_mips="true" />
+ <texture name="cloud-particle.j2c" use_mips="true" />
+
<!--WARNING OLD ART BELOW *do not use*-->
<texture name="icn_chatbar.tga" />
<texture name="icn_media_web.tga" preload="true" />
@@ -676,8 +682,6 @@ with the same filename but different name
<texture name="toggle_button_off" file_name="toggle_button_off.png" preload="true" />
<texture name="toggle_button_selected" file_name="toggle_button_selected.png" preload="true" />
-
- <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4" />
<texture name="color_swatch_alpha.tga" preload="true" />
<texture name="button_anim_pause.tga" />
@@ -696,7 +700,6 @@ with the same filename but different name
<texture name="icon_event_mature.tga" />
<texture name="icon_for_sale.tga" />
<texture name="icon_place_for_sale.tga" />
- <texture name="icon_popular.tga" />
<texture name="icon_top_pick.tga" />
<texture name="lag_status_critical.tga" />
@@ -715,27 +718,10 @@ with the same filename but different name
<texture name="map_telehub.tga" />
<texture name="map_track_16.tga" />
- <texture name="media_icon.tga" file_name="icn_label_media.tga" />
- <texture name="music_icon.tga" file_name="icn_label_music.tga" />
-
- <texture name="notify_tip_icon.tga" />
<texture name="notify_caution_icon.tga" />
<texture name="notify_next.png" preload="true" />
<texture name="notify_box_icon.tga" />
- <texture name="pixiesmall.j2c" use_mips="true" />
- <texture name="script_error.j2c" use_mips="true" />
- <texture name="silhouette.j2c" use_mips="true" />
- <texture name="foot_shadow.j2c" use_mips="true" />
- <texture name="cloud-particle.j2c" use_mips="true" />
-
- <texture name="status_no_build.tga" />
- <texture name="status_voice.tga" />
- <texture name="status_no_fly.tga" />
- <texture name="status_health.tga" />
- <texture name="status_no_push.tga" />
- <texture name="status_no_scripts.tga" />
-
<texture name="icn_active-speakers-dot-lvl0.tga" />
<texture name="icn_active-speakers-dot-lvl1.tga" />
<texture name="icn_active-speakers-dot-lvl2.tga" />
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index fa7e3e86a3..45100eb1ff 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -198,40 +198,6 @@
function="Floater.Toggle"
parameter="nearby_media" />
</menu_item_check>
- <!--menu_item_check
- label="Block List"
- layout="topleft"
- name="Mute List">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="mute" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="mute" />
- </menu_item_check-->
- <menu_item_separator
- layout="topleft" />
- <menu_item_check
- label="(Legacy) Communicate"
- layout="topleft"
- name="Instant Message"
- shortcut="control|T">
- <menu_item_check.on_check
- function="Floater.Visible"
- parameter="communicate" />
- <menu_item_check.on_click
- function="Floater.Toggle"
- parameter="communicate" />
- </menu_item_check>
- <menu_item_call
- label="(Temp) Media Remote Ctrl"
- layout="topleft"
- name="Preferences"
- shortcut="control|alt|M">
- <menu_item_call.on_click
- function="Floater.Toggle"
- parameter="media_remote_ctrl" />
- </menu_item_call>
</menu>
<menu
label="World"
@@ -283,7 +249,7 @@
</menu_item_call>
<menu
create_jump_keys="true"
- label="About This Place"
+ label="Place Profile"
layout="topleft"
name="Land"
tear_off="true">
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index e2884dbedc..9ad99b1f13 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -47,7 +47,7 @@
left="10"
name="back_btn"
tool_tip="Go back to previous location"
- top="3"
+ top="2"
width="31" />
<button
follows="left|top"
@@ -92,7 +92,6 @@
width="20" />
-->
</location_input>
-
<!-- <button -->
<!-- follows="right|top" -->
<!-- height="20" -->
@@ -108,7 +107,6 @@
<!-- name="search_bg" -->
<!-- top_delta="0" -->
<!-- width="168" /> -->
-
<search_combo_box
bevel_style="none"
border_style="line"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index c98555735a..22c75a595e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -260,7 +260,7 @@
width="200">
My effects:
</text>
- <text
+ <text
type="string"
length="1"
follows="left|top"
@@ -270,16 +270,23 @@
name="title_afk_text"
width="190">
Away timeout:
- </text>
+ </text>
<color_swatch
- control_name="EffectColor"
+ can_apply_immediately="true"
follows="left|top"
height="50"
layout="topleft"
left="50"
name="effect_color_swatch"
tool_tip="Click to open Color Picker"
- width="38" />
+ width="38">
+ <color_swatch.init_callback
+ function="Pref.getUIColor"
+ parameter="EffectColor" />
+ <color_swatch.commit_callback
+ function="Pref.applyUIColor"
+ parameter="EffectColor" />
+ </color_swatch>
<combo_box
height="23"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 5c9c9b5611..bfca2f2e46 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -42,18 +42,36 @@
<button
auto_resize="true"
halign="right"
+ font="SansSerifSmall"
+ follows="right|top"
+ image_overlay=""
+ image_selected="spacer35.tga"
+ image_unselected="spacer35.tga"
+ image_pressed="spacer35.tga"
+ height="16"
+ right="-228"
+ label_shadow="false"
+ name="buycurrency"
+ tool_tip="My Balance"
+ top="5"
+ width="100" />
+ <button
+ auto_resize="true"
+ halign="right"
+ font="SansSerifSmall"
follows="right|top"
image_selected="BuyArrow_Over"
image_unselected="BuyArrow_Over"
image_pressed="BuyArrow_Press"
height="16"
- right="-128"
- label_color="White"
+ label="Buy L$"
+ label_color="EmphasisColor"
+ left_pad="0"
label_shadow="false"
- name="buycurrency"
+ name="buyL"
pad_right="20px"
- tool_tip="My Balance: Click to buy more L$"
- top="3"
+ tool_tip="Click to buy more L$"
+ top="5"
width="100" />
<text
type="string"
@@ -62,24 +80,23 @@
follows="right|bottom"
halign="right"
height="16"
- top="4"
+ top="7"
layout="topleft"
left_pad="0"
name="TimeText"
- text_color="TimeTextColor"
tool_tip="Current time (Pacific)"
width="85">
12:00 AM
</text>
<button
follows="right|bottom"
- height="16"
+ height="15"
image_selected="AudioMute_Off"
image_pressed="Audio_Press"
image_unselected="Audio_Off"
is_toggle="true"
left_pad="18"
- top="1"
+ top="4"
name="volume_btn"
tool_tip="Global Volume Control"
width="16" />
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 67bb7c1896..0f1c8d0635 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -96,7 +96,7 @@
name="damage_icon"
width="14"
height="13"
- top="22"
+ top="25"
left="2"
follows="right|top"
image_name="Parcel_Damage_Dark"
@@ -112,11 +112,13 @@
font="SansSerifSmall"
text_color="TextFgColor"
/>
-
- <combo_button name="Location History"
- label=""
- pad_right="0"/>
- <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"
+ <combo_button
+ name="Location History"
+ label=""
+ pad_right="0"/>
+ <combo_list
+ bg_writeable_color="MenuDefaultBgColor"
+ page_lines="10"
scroll_bar_bg_visible="true" />
<combo_editor name="Combo Text Entry"
text_pad_left="22"
@@ -124,5 +126,5 @@
font="SansSerifSmall"
bevel_style="none"
border_style="line"
- border.border_thickness="0"/>
+ border.border_thickness="0" />
</location_input>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 02:24:09 +0000