diff options
| author | James Cook <james@lindenlab.com> | 2009-11-05 17:16:46 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-05 17:16:46 -0800 |
| commit | 6970ffa5aac2670bc25f57d42df4aad79c2866fa (patch) | |
| tree | 2ec0075d4c5b02e2a889ccb8da564c3203d00466 /indra | |
| parent | 36f295fb9e3d91b59cc900862087ba4023b975d5 (diff) | |
| parent | d0bb161daa1d413baee1386caee49d335db9e297 (diff) | |
merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llwlparammanager.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/accordion_tab.xml | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp index 1581153c19..c6fd35c142 100644 --- a/indra/newview/llwlparammanager.cpp +++ b/indra/newview/llwlparammanager.cpp @@ -196,7 +196,7 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate) escaped_filename += ".xml"; std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", escaped_filename)); - llinfos << "Loading WindLight sky setting from " << pathName << llendl; + //llinfos << "Loading WindLight sky setting from " << pathName << llendl; llifstream presetsXML; presetsXML.open(pathName.c_str()); diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml index fcfe89c653..08c337455c 100644 --- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <accordion_tab + font="SansSerifBold" header_bg_color="DkGray2" - header_txt_color="LtGray" header_collapse_img="Accordion_ArrowClosed_Off" header_collapse_img_pressed="Accordion_ArrowClosed_Press" header_expand_img="Accordion_ArrowOpened_Off" @@ -9,5 +9,6 @@ header_image="Accordion_Off" header_image_over="Accordion_Over" header_image_pressed="Accordion_Press" - header_image_selected="Accordion_Selected" + header_image_expanded="Accordion_Selected" + header_text_color="LtGray" /> |