livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with ssh://angela@hg.lindenlab.com/james/gooey

meow-7.2.2
angela 2010-01-12 11:40:52 +08:00
parent 82c1e6cce2 43d97298d5
commit e9e651f5e4
4 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
indra/newview/installers/darwin/dmg-cleanup.applescript Normal file → Executable file
View File

14
indra/newview/installers/darwin/fix_application_icon_position.sh Executable file
View File

@ -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

2
indra/newview/llfloaterpreference.cpp
View File

@ -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);

15
indra/newview/skins/default/xui/en/panel_preferences_general.xml
View File

@ -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"