From d6101558a171dbd2390792ac1e78d09fc2c27711 Mon Sep 17 00:00:00 2001 From: James Cook Date: Mon, 6 Jul 2009 21:58:04 +0000 Subject: Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux. svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5 --- indra/llui/lluicolortable.cpp | 169 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 151 insertions(+), 18 deletions(-) (limited to 'indra/llui/lluicolortable.cpp') diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp index 27ba6cc8b4..0320e998d0 100644 --- a/indra/llui/lluicolortable.cpp +++ b/indra/llui/lluicolortable.cpp @@ -11,7 +11,10 @@ #include +#include "lldir.h" +#include "llui.h" #include "lluicolortable.h" +#include "lluictrlfactory.h" LLUIColorTable::ColorParams::ColorParams() : value("value"), @@ -26,17 +29,16 @@ LLUIColorTable::ColorEntryParams::ColorEntryParams() } LLUIColorTable::Params::Params() -: color_entries("color_entries") +: color_entries("color") { } -void LLUIColorTable::init(const Params& p) +void LLUIColorTable::insertFromParams(const Params& p) { // this map will contain all color references after the following loop typedef std::map string_string_map_t; string_string_map_t unresolved_refs; - mColors.clear(); for(LLInitParam::ParamIterator::const_iterator it = p.color_entries().begin(); it != p.color_entries().end(); ++it) @@ -44,7 +46,7 @@ void LLUIColorTable::init(const Params& p) ColorEntryParams color_entry = *it; if(color_entry.color.value.isChosen()) { - mColors.insert(string_color_map_t::value_type(color_entry.name, color_entry.color.value)); + setColor(color_entry.name, color_entry.color.value, mLoadedColors); } else { @@ -66,19 +68,21 @@ void LLUIColorTable::init(const Params& p) // we haven't visited any references yet visited_refs.clear(); - string_string_map_t::iterator it = unresolved_refs.begin(); + string_string_map_t::iterator current = unresolved_refs.begin(); + string_string_map_t::iterator previous; + while(true) { - if(it != unresolved_refs.end()) + if(current != unresolved_refs.end()) { // locate the current reference in the previously visited references... - string_color_ref_iter_map_t::iterator visited = visited_refs.lower_bound(it->first); + string_color_ref_iter_map_t::iterator visited = visited_refs.lower_bound(current->first); if(visited != visited_refs.end() - && !(visited_refs.key_comp()(it->first, visited->first))) + && !(visited_refs.key_comp()(current->first, visited->first))) { // ...if we find the current reference in the previously visited references // we know that there is a cycle - std::string ending_ref = it->first; + std::string ending_ref = current->first; std::string warning("The following colors form a cycle: "); // warn about the references in the chain and remove them from @@ -102,17 +106,17 @@ void LLUIColorTable::init(const Params& p) else { // ...continue along the reference chain - ref_chain.push(it->first); - visited_refs.insert(visited, string_color_ref_iter_map_t::value_type(it->first, it)); + ref_chain.push(current->first); + visited_refs.insert(visited, string_color_ref_iter_map_t::value_type(current->first, current)); } } else { // since this reference does not refer to another reference it must refer to an // actual color, lets find it... - string_color_map_t::iterator color_value = mColors.find(it->second); + string_color_map_t::iterator color_value = mLoadedColors.find(previous->second); - if(color_value != mColors.end()) + if(color_value != mLoadedColors.end()) { // ...we found the color, and we now add every reference in the reference chain // to the color map @@ -120,7 +124,7 @@ void LLUIColorTable::init(const Params& p) iter != visited_refs.end(); ++iter) { - mColors.insert(string_color_map_t::value_type(iter->first, color_value->second)); + setColor(iter->first, color_value->second, mLoadedColors); unresolved_refs.erase(iter->second); } @@ -143,13 +147,142 @@ void LLUIColorTable::init(const Params& p) } // find the next color reference in the reference chain - it = unresolved_refs.find(it->second); + previous = current; + current = unresolved_refs.find(current->second); + } + } +} + +void LLUIColorTable::clear() +{ + clearTable(mLoadedColors); + clearTable(mUserSetColors); +} + +LLUIColor LLUIColorTable::getColor(const std::string& name, const LLColor4& default_color) const +{ + string_color_map_t::const_iterator iter = mUserSetColors.find(name); + if(iter != mUserSetColors.end()) + { + return LLUIColor(&iter->second); + } + + iter = mLoadedColors.find(name); + return (iter != mLoadedColors.end() ? LLUIColor(&iter->second) : LLUIColor(default_color)); +} + +// update user color, loaded colors are parsed on initialization +void LLUIColorTable::setColor(const std::string& name, const LLColor4& color) +{ + setColor(name, color, mUserSetColors); +} + +bool LLUIColorTable::loadFromSettings() +{ + bool result = false; + + std::string default_filename = gDirUtilp->getExpandedFilename(LL_PATH_DEFAULT_SKIN, "colors_def.xml"); + result |= loadFromFilename(default_filename); + + std::string current_filename = gDirUtilp->getExpandedFilename(LL_PATH_TOP_SKIN, "colors_def.xml"); + if(current_filename != default_filename) + { + result |= loadFromFilename(current_filename); + } + + std::string user_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SKIN, "colors_def.xml"); + loadFromFilename(user_filename); + + return result; +} + +void LLUIColorTable::saveUserSettings() const +{ + Params params; + + for(string_color_map_t::const_iterator it = mUserSetColors.begin(); + it != mUserSetColors.end(); + ++it) + { + ColorEntryParams color_entry; + color_entry.name = it->first; + color_entry.color.value = it->second; + + params.color_entries.add(color_entry); + } + + LLXMLNodePtr output_node = new LLXMLNode("colors", false); + LLXUIParser::instance().writeXUI(output_node, params); + + if(!output_node->isNull()) + { + const std::string& filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SKIN, "colors_def.xml"); + LLFILE *fp = LLFile::fopen(filename, "w"); + + if(fp != NULL) + { + LLXMLNode::writeHeaderToFile(fp); + output_node->writeToFile(fp); + + fclose(fp); } } } -const LLColor4& LLUIColorTable::getColor(const std::string& name) const +bool LLUIColorTable::colorExists(const std::string& color_name) const +{ + return ((mLoadedColors.find(color_name) != mLoadedColors.end()) + || (mUserSetColors.find(color_name) != mUserSetColors.end())); +} + +void LLUIColorTable::clearTable(string_color_map_t& table) +{ + for(string_color_map_t::iterator it = table.begin(); + it != table.end(); + ++it) + { + it->second = LLColor4::magenta; + } +} + +// this method inserts a color into the table if it does not exist +// if the color already exists it changes the color +void LLUIColorTable::setColor(const std::string& name, const LLColor4& color, string_color_map_t& table) +{ + string_color_map_t::iterator it = table.lower_bound(name); + if(it != table.end() + && !(table.key_comp()(name, it->first))) + { + it->second = color; + } + else + { + table.insert(it, string_color_map_t::value_type(name, color)); + } +} + +bool LLUIColorTable::loadFromFilename(const std::string& filename) { - string_color_map_t::const_iterator iter = mColors.find(name); - return (iter != mColors.end() ? iter->second : LLColor4::magenta); + LLXMLNodePtr root; + + if(!LLXMLNode::parseFile(filename, root, NULL)) + { + llwarns << "Unable to parse color file " << filename << llendl; + return false; + } + + Params params; + LLXUIParser::instance().readXUI(root, params); + + if(params.validateBlock()) + { + insertFromParams(params); + } + else + { + llwarns << filename << " failed to load" << llendl; + return false; + } + + return true; } -- cgit v1.3 From 394b28ce77e5e51c41c1d3d9ca9896812f404810 Mon Sep 17 00:00:00 2001 From: Austin Doupnik Date: Thu, 9 Jul 2009 00:59:52 +0000 Subject: DEV-35112 Renamed colors_def.xml to colors.xml. Reviewed by Richard. --- indra/llui/lluicolortable.cpp | 14 +- indra/newview/llappviewer.cpp | 6 +- indra/newview/llviewercontrol.cpp | 64 - indra/newview/llviewercontrol.h | 4 - indra/newview/skins/default/colors.xml | 3774 ++++++-------------------------- 5 files changed, 674 insertions(+), 3188 deletions(-) (limited to 'indra/llui/lluicolortable.cpp') diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp index 0320e998d0..087a99c2b0 100644 --- a/indra/llui/lluicolortable.cpp +++ b/indra/llui/lluicolortable.cpp @@ -181,16 +181,16 @@ bool LLUIColorTable::loadFromSettings() { bool result = false; - std::string default_filename = gDirUtilp->getExpandedFilename(LL_PATH_DEFAULT_SKIN, "colors_def.xml"); + std::string default_filename = gDirUtilp->getExpandedFilename(LL_PATH_DEFAULT_SKIN, "colors.xml"); result |= loadFromFilename(default_filename); - std::string current_filename = gDirUtilp->getExpandedFilename(LL_PATH_TOP_SKIN, "colors_def.xml"); + std::string current_filename = gDirUtilp->getExpandedFilename(LL_PATH_TOP_SKIN, "colors.xml"); if(current_filename != default_filename) { result |= loadFromFilename(current_filename); } - std::string user_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SKIN, "colors_def.xml"); + std::string user_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SKIN, "colors.xml"); loadFromFilename(user_filename); return result; @@ -216,7 +216,7 @@ void LLUIColorTable::saveUserSettings() const if(!output_node->isNull()) { - const std::string& filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SKIN, "colors_def.xml"); + const std::string& filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SKIN, "colors.xml"); LLFILE *fp = LLFile::fopen(filename, "w"); if(fp != NULL) @@ -271,6 +271,12 @@ bool LLUIColorTable::loadFromFilename(const std::string& filename) return false; } + if(!root->hasName("colors")) + { + llwarns << filename << " is not a valid color definition file" << llendl; + return false; + } + Params params; LLXUIParser::instance().readXUI(root, params); diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index de3cf1a81b..c9b27e9802 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1701,11 +1701,7 @@ std::string LLAppViewer::getSettingsFilename(const std::string& location_key, void LLAppViewer::loadColorSettings() { - if(!LLUIColorTable::instance().loadFromSettings()) - { - convert_legacy_color_settings(); - LLUIColorTable::instance().loadFromSettings(); - } + LLUIColorTable::instance().loadFromSettings(); } bool LLAppViewer::initConfiguration() diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index 0f3feb789f..0a71c14120 100644 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -601,70 +601,6 @@ void settings_setup_listeners() gSavedSettings.getControl("VelocityInterpolate")->getSignal()->connect(boost::bind(&handleVelocityInterpolate, _2)); } -class ColorConvertFunctor : public LLControlGroup::ApplyFunctor -{ -public: - ColorConvertFunctor(LLUIColorTable::Params& params) - :mParams(params) - { - } - - void apply(const std::string& name, LLControlVariable* control) - { - if(control->isType(TYPE_COL4)) - { - LLUIColorTable::ColorParams color_params; - color_params.value = LLColor4(control->getValue()); - - mParams.color_entries.add(LLUIColorTable::ColorEntryParams().name(name).color(color_params)); - } - } - -private: - LLUIColorTable::Params& mParams; -}; - -static void convert_legacy_color_settings(const std::string& location_key, ELLPath path) -{ - LLControlGroup::getInstance("Skinning")->cleanup(); - LLAppViewer::instance()->loadSettingsFromDirectory(location_key); - - LLUIColorTable::Params params; - ColorConvertFunctor ccf(params); - LLControlGroup::getInstance("Skinning")->applyToAll(&ccf); - - LLXMLNodePtr output_node = new LLXMLNode("colors", false); - LLXUIParser::instance().writeXUI(output_node, params); - - if(!output_node->isNull()) - { - std::string filename = gDirUtilp->getExpandedFilename(path, "colors_def.xml"); - LLFILE *fp = LLFile::fopen(filename, "w"); - - if(fp != NULL) - { - LLXMLNode::writeHeaderToFile(fp); - output_node->writeToFile(fp); - - fclose(fp); - } - } - - LLControlGroup::getInstance("Skinning")->cleanup(); -} - -void convert_legacy_color_settings() -{ - LLControlGroup saved_skin_settings("Skinning"); - - convert_legacy_color_settings("DefaultSkin", LL_PATH_DEFAULT_SKIN); - convert_legacy_color_settings("CurrentSkin", LL_PATH_TOP_SKIN); - convert_legacy_color_settings("UserSkin", LL_PATH_USER_SKIN); - - saved_skin_settings.cleanup(); -} - - #if TEST_CACHED_CONTROL #define DECL_LLCC(T, V) static LLCachedControl mySetting_##T("TestCachedControl"#T, V) diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h index 0e1c24e4fb..b1f14eca7b 100644 --- a/indra/newview/llviewercontrol.h +++ b/indra/newview/llviewercontrol.h @@ -50,10 +50,6 @@ void settings_setup_listeners(); // for the graphics settings void create_graphics_group(LLControlGroup& group); -// convert legacy colors.xml LLSD based color settings to -// newer colors_def.xml XUI/Params based color settings -void convert_legacy_color_settings(); - // saved at end of session extern LLControlGroup gSavedSettings; extern LLControlGroup gSavedPerAccountSettings; diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 94b9b04bb0..69bd09f0e5 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -1,3112 +1,664 @@ - - - - AgentChatColor - - Comment - Color of chat messages from other residents - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 1.0 - 1.0 - - - AlertBoxColor - - Comment - Alert Box Color - Persist - 1 - Type - Color4 - Value - - 0.24 - 0.24 - 0.24 - 1 - - - AlertCautionBoxColor - - Comment - Alert Caution Box Color - Persist - 1 - Type - Color4 - Value - - 1 - 0.82 - 0.46 - 1 - - - AlertCautionTextColor - - Comment - Alert Caution Text Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 1 - - - AlertTextColor - - Comment - Alert Text Color - Persist - 1 - Type - Color4 - Value - - 0.58 - 0.66 - 0.84 - 1 - - - AvatarNameColor - - Comment - Avatar Name Color - Persist - 1 - Type - Color4 - Value - - 0.98 - 0.69 - 0.36 - 1 - - - BackgroundChatColor - - Comment - Color of chat bubble background - Persist - 1 - Type - Color4 - Value - - 0.0 - 0.0 - 0.0 - 1.0 - - - ButtonBorderColor - - Comment - Button Border Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - ButtonCautionImageColor - - Comment - Button Caution Image Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - ButtonColor - - Comment - Button Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - ButtonFlashBgColor - - Comment - Button Color - Persist - 1 - Type - Color4 - Value - - 0.334399998188018798828125 - 0.545599997043609619140625 - 0.51590001583099365234375 - 0.5 - - - ButtonImageColor - - Comment - Button Image Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - ButtonLabelColor - - Comment - Button Label Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - ButtonLabelDisabledColor - - Comment - Button Label Disabled Color - Persist - 1 - Type - Color4 - Value - - 0.75 - 0.75 - 0.75 - 0.7799999713897705078125 - - - ButtonLabelSelectedColor - - Comment - Button Label Selected Color - Persist - 1 - Type - Color4 - Value - - 0.86 - 0.86 - 0.86 - 1 - - - ButtonLabelSelectedDisabledColor - - Comment - Button Label Selected Disabled Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 0.7799999713897705078125 - - - ButtonSelectedBgColor - - Comment - Button Selected Bg Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - ButtonSelectedColor - - Comment - Button Selected Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - ButtonUnselectedBgColor - - Comment - Button Unselected Bg Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - ButtonUnselectedFgColor - - Comment - Button Unselected Fg Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - ChatHistoryBgColor - - Comment - Chat History Bg Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 0 - - - ChatHistoryTextColor - - Comment - Chat History Text Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - ColorDropShadow - - Comment - Color Drop Shadow - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 0.78 - - - ColorPaletteEntry01 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.0 - 0.0 - 0.0 - 1.0 - - - ColorPaletteEntry02 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.5 - 0.5 - 0.5 - 1.0 - - - ColorPaletteEntry03 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.334399998188018798828125 - 0.545599997043609619140625 - 0.51590001583099365234375 - 1.0 - - - ColorPaletteEntry04 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.5 - 0.5 - 0.0 - 1.0 - - - ColorPaletteEntry05 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.0 - 0.5 - 0.0 - 1.0 - - - ColorPaletteEntry06 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.0 - 0.5 - 0.5 - 1.0 - - - ColorPaletteEntry07 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.0 - 0.0 - 0.5 - 1.0 - - - ColorPaletteEntry08 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.5 - 0.0 - 0.5 - 1.0 - - - ColorPaletteEntry09 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.5 - 0.5 - 0.0 - 1.0 - - - ColorPaletteEntry10 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.0 - 0.25 - 0.25 - 1.0 - - - ColorPaletteEntry11 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.0 - 0.5 - 1.0 - 1.0 - - - ColorPaletteEntry12 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.0 - 0.25 - 0.5 - 1.0 - - - ColorPaletteEntry13 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.5 - 0.0 - 1.0 - 1.0 - - - ColorPaletteEntry14 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.5 - 0.25 - 0.0 - 1.0 - - - ColorPaletteEntry15 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 1.0 - 1.0 - - - ColorPaletteEntry16 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 1.0 - 1.0 - - - ColorPaletteEntry17 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 1.0 - 1.0 - - - ColorPaletteEntry18 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.75 - 0.75 - 0.75 - 1.0 - - - ColorPaletteEntry19 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 1.0 - 0.0 - 0.0 - 1.0 - - - ColorPaletteEntry20 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 0.0 - 1.0 - - - ColorPaletteEntry21 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.0 - 1.0 - 0.0 - 1.0 - - - ColorPaletteEntry22 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.0 - 1.0 - 1.0 - 1.0 - - - ColorPaletteEntry23 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.0 - 0.0 - 1.0 - 1.0 - - - ColorPaletteEntry24 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 1.0 - 0.0 - 1.0 - 1.0 - - - ColorPaletteEntry25 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 0.5 - 1.0 - - - ColorPaletteEntry26 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.0 - 1.0 - 0.5 - 1.0 - - - ColorPaletteEntry27 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.5 - 1.0 - 1.0 - 1.0 - - - ColorPaletteEntry28 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 0.5 - 0.5 - 1.0 - 1.0 - - - ColorPaletteEntry29 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 1.0 - 0.0 - 0.5 - 1.0 - - - ColorPaletteEntry30 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 1.0 - 0.5 - 0.0 - 1.0 - - - ColorPaletteEntry31 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 1.0 - 1.0 - - - ColorPaletteEntry32 - - Comment - Color picker palette entry - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 1.0 - 1.0 - - - ConsoleBackground - - Comment - Console Background - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 1 - - - ContextSilhouetteColor - - Comment - Context Silhouette Color - Persist - 1 - Type - Color4 - Value - - 0.94 - 0.61 - 0 - 1 - - - DefaultHighlightDark - - Comment - Default Highlight Dark - Persist - 1 - Type - Color4 - Value - - 0.1 - 0.1 - 0.1 - 1 - - - DefaultHighlightLight - - Comment - Default Highlight Light - Persist - 1 - Type - Color4 - Value - - 0.45 - 0.52 - 0.61 - 1 - - - DefaultShadowDark - - Comment - Default Shadow Dark - Persist - 1 - Type - Color4 - Value - - 0.1 - 0.1 - 0.1 - 1 - - - DefaultShadowLight - - Comment - Default Shadow Light - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 1 - - - EffectColor - - Comment - Particle effects color - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 1.0 - 1.0 - - - FilterBackgroundColor - - Comment - Filter Background Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - FilterTextColor - - Comment - Filter Text Color - Persist - 1 - Type - Color4 - Value - - 1 - 0.78 - 0.27 - 1 - - - FloaterButtonImageColor - - Comment - Floater Button Image Color - Persist - 1 - Type - Color4 - Value - - 0.334399998188018798828125 - 0.545599997043609619140625 - 0.51590001583099365234375 - 1 - - - FloaterDefaultBackgroundColor - - Comment - Default Background Color - Persist - 1 - Type - Color4 - Value - - 0.24 - 0.24 - 0.24 - 0.55 - - - FloaterFocusBackgroundColor - - Comment - Focus Background Color - Persist - 1 - Type - Color4 - Value - - 0.24 - 0.24 - 0.24 - 1 - - - FloaterFocusBorderColor - - Comment - Floater Focus Border Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 0.31 - - - FloaterUnfocusBorderColor - - Comment - Floater Unfocus Border Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 0.31 - - - FocusColor - - Comment - Focus Color - Persist - 1 - Type - Color4 - Value - - 0.272800028324127197265625 - 0.607199966907501220703125 - 0.5601749420166015625 - 1 - - - FolderViewLoadingMessageTextColor - - Comment - Folder View Loading Message Text Color - Persist - 1 - Type - Color4 - Value - - 0.334399998188018798828125 - 0.545599997043609619140625 - 0.51590001583099365234375 - 1 - - - GridFocusPointColor - - Comment - Grid Focus Point Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 0.5 - - - GridlineBGColor - - Comment - Gridline BGColor - Persist - 1 - Type - Color4 - Value - - 0.92 - 0.92 - 1 - 0.78 - - - GridlineColor - - Comment - Gridline Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - GridlineShadowColor - - Comment - Gridline Shadow Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 0.31 - - - GroupNotifyBoxColor - - Comment - Group Notify Box Color - Persist - 1 - Type - Color4 - Value - - 0.334399998188018798828125 - 0.545599997043609619140625 - 0.51590001583099365234375 - 1 - - - GroupNotifyTextColor - - Comment - Group Notify Text Color - Persist - 1 - Type - Color4 - Value - - 0 - 0.12 - 0.24 - 1 - - - GroupOverTierColor - - Comment - Group Over Tier Color - Persist - 1 - Type - Color4 - Value - - 0.43 - 0.06 - 0.06 - 1 - - - HTMLLinkColor - - Comment - Color of hyperlinks - Persist - 1 - Type - Color4 - Value - - 0.334399998188018798828125 - 0.545599997043609619140625 - 0.51590001583099365234375 - 1 - - - HealthTextColor - - Comment - Health Text Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - HelpBgColor - - Comment - Help Bg Color - Persist - 1 - Type - Color4 - Value - - 0.78 - 0.82 - 0.8 - 1 - - - HelpFgColor - - Comment - Help Fg Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 1 - - - HelpScrollHighlightColor - - Comment - Help Scroll Highlight Color - Persist - 1 - Type - Color4 - Value - - 0.45 - 0.52 - 0.61 - 1 - - - HelpScrollShadowColor - - Comment - Help Scroll Shadow Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 1 - - - HelpScrollThumbColor - - Comment - Help Scroll Thumb Color - Persist - 1 - Type - Color4 - Value - - 0.31 - 0.38 - 0.49 - 1 - - - HelpScrollTrackColor - - Comment - Help Scroll Track Color - Persist - 1 - Type - Color4 - Value - - 0.72 - 0.72 - 0.74 - 1 - - - HighlightChildColor - - Comment - Highlight Child Color - Persist - 1 - Type - Color4 - Value - - 0.67 - 0.83 - 0.96 - 1 - - - HighlightInspectColor - - Comment - Highlight Inspect Color - Persist - 1 - Type - Color4 - Value - - 1 - 0.5 - 0 - 1 - - - HighlightParentColor - - Comment - Highlight Parent Color - Persist - 1 - Type - Color4 - Value - - 0.67 - 0.83 - 0.96 - 1 - - - IMChatColor - - Comment - Color of instant messages from other residents - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 1.0 - 1.0 - - - IMHistoryBgColor - - Comment - IMHistory Bg Color - Persist - 1 - Type - Color4 - Value - - 0 - 0.12 - 0.31 - 0.78 - - - IMHistoryTextColor - - Comment - IMHistory Text Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - IconDisabledColor - - Comment - Icon Disabled Color - Persist - 1 - Type - Color4 - Value - - 0.58 - 0.66 - 0.84 - 0.78 - - - IconEnabledColor - - Comment - Icon Enabled Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - InventoryBackgroundColor - - Comment - Inventory Background Color - Persist - 1 - Type - Color4 - Value - - 0.24 - 0.24 - 0.24 - 0.31 - - - InventoryItemSuffixColor - - Comment - Inventory Item Suffix Color - Persist - 1 - Type - Color4 - Value - - 0.75 - 0.85 - 0.85 - 1 - - - InventorySearchStatusColor - - Comment - Inventory Search Status Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - LabelDisabledColor - - Comment - Label Disabled Color - Persist - 1 - Type - Color4 - Value - - 0.58 - 0.66 - 0.84 - 0.3 - - - LabelSelectedColor - - Comment - Label Selected Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - LabelSelectedDisabledColor - - Comment - Label Selected Disabled Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 0.5 - - - LabelTextColor - - Comment - Label Text Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - LoginProgressBarBgColor - - Comment - Login Progress Bar Bg Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - LoginProgressBarFgColor - - Comment - Login Progress Bar Fg Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - LoginProgressBoxBorderColor - - Comment - Login Progress Box Border Color - Persist - 1 - Type - Color4 - Value - - 0 - 0.12 - 0.24 - 0 - - - LoginProgressBoxCenterColor - - Comment - Login Progress Box Center Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 0.78 - - - LoginProgressBoxShadowColor - - Comment - Login Progress Box Shadow Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 0.78 - - - LoginProgressBoxTextColor - - Comment - Login Progress Box Text Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - MapAvatarColor - - Comment - Color of chat messages from other residents - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 1.0 - 1.0 - - - MapAvatarFriendColor - - Comment - Color of chat messages from other residents - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 0.0 - 1.0 - - - MapAvatarSelfColor - - Comment - Color of chat messages from other residents - Persist - 1 - Type - Color4 - Value - - 0.53125 - 0 - 0.498047053813934326171875 - 1 - - - MapFrustumColor - - Comment - Color of chat messages from other residents - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 1.0 - 0.1 - - - MapFrustumRotatingColor - - Comment - Color of chat messages from other residents - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 1.0 - 0.2 - - - MapTrackColor - - Comment - Color of chat messages from other residents - Persist - 1 - Type - Color4 - Value - - 1.0 - 0.0 - 0.0 - 1.0 - - - MapTrackDisabledColor - - Comment - Color of chat messages from other residents - Persist - 1 - Type - Color4 - Value - - 0.5 - 0.0 - 0.0 - 1.0 - - - - - MenuBarBgColor - - Comment - Menu Bar Bg Color - Persist - 1 - Type - Color4 - Value - - 0.24 - 0.24 - 0.24 - 1 - - - MenuBarGodBgColor - - Comment - Menu Bar God Bg Color - Persist - 1 - Type - Color4 - Value - - 0.0 - 0.0 - 0.0 - 1 - - - MenuDefaultBgColor - - Comment - Menu Default Bg Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 1 - - - MenuItemDisabledColor - - Comment - Menu Item Disabled Color - Persist - 1 - Type - Color4 - Value - - 0.52 - 0.52 - 0.64 - 0.5 - - - MenuItemEnabledColor - - Comment - Menu Item Enabled Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - MenuItemHighlightBgColor - - Comment - Menu Item Highlight Bg Color - Persist - 1 - Type - Color4 - Value - - 0.72 - 0.72 - 0.74 - 0.39 - - - MenuItemHighlightFgColor - - Comment - Menu Item Highlight Fg Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - MenuNonProductionBgColor - - Comment - Menu Non Production Bg Color - Persist - 1 - Type - Color4 - Value - - 0.5 - 0 - 0 - 1 - - - MenuNonProductionGodBgColor - - Comment - Menu Non Production God Bg Color - Persist - 1 - Type - Color4 - Value - - 0 - 0.5 - 0 - 1 - - - MenuPopupBgColor - - Comment - Menu Popup Bg Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 1 - - - MultiSliderDisabledThumbColor - - Comment - Multi Slider Disabled Thumb Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 1 - - - MultiSliderThumbCenterColor - - Comment - Multi Slider Thumb Center Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - MultiSliderThumbCenterSelectedColor - - Comment - Multi Slider Thumb Center Selected Color - Persist - 1 - Type - Color4 - Value - - 1 - 0.2 - 0.2 - 1 - - - MultiSliderThumbOutlineColor - - Comment - Multi Slider Thumb Outline Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 1 - - - MultiSliderTrackColor - - Comment - Multi Slider Track Color - Persist - 1 - Type - Color4 - Value - - 0.12 - 0.12 - 0.12 - 1 - - - MultiSliderTriangleColor - - Comment - Multi Slider Triangle Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 0.2 - 1 - - - NetMapBackgroundColor - - Comment - Net Map Background Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 0.3 - - - NetMapGroupOwnAboveWater - - Comment - Net Map Group Own Above Water - Persist - 1 - Type - Color4 - Value - - 1 - 0 - 1 - 1 - - - NetMapGroupOwnBelowWater - - Comment - Net Map Group Own Below Water - Persist - 1 - Type - Color4 - Value - - 0.78 - 0 - 0.78 - 1 - - - NetMapOtherOwnAboveWater - - Comment - Net Map Other Own Above Water - Persist - 1 - Type - Color4 - Value - - 0.24 - 0.24 - 0.24 - 1 - - - NetMapOtherOwnBelowWater - - Comment - Net Map Other Own Below Water - Persist - 1 - Type - Color4 - Value - - 0.12 - 0.12 - 0.12 - 1 - - - NetMapYouOwnAboveWater - - Comment - Net Map You Own Above Water - Persist - 1 - Type - Color4 - Value - - 0 - 1 - 1 - 1 - - - NetMapYouOwnBelowWater - - Comment - Net Map You Own Below Water - Persist - 1 - Type - Color4 - Value - - 0 - 0.78 - 0.78 - 1 - - - NotifyBoxColor - - Comment - Notify Box Color - Persist - 1 - Type - Color4 - Value - - 0.27 - 0.67 - 1 - 1 - - - NotifyCautionBoxColor - - Comment - Notify Caution Box Color - Persist - 1 - Type - Color4 - Value - - 1 - 0.82 - 0.46 - 1 - - - NotifyCautionWarnColor - - Comment - Notify Caution Warn Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 1 - - - NotifyTextColor - - Comment - Notify Text Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 1 - - - ObjectChatColor - - Comment - Color of chat messages from objects - Persist - 0 - Type - Color4 - Value - - 0.7 - 0.9 - 0.7 - 1.0 - - - OverdrivenColor - - Comment - Color of various indicators when resident is speaking too loud. - Persist - 0 - Type - Color4 - Value - - 1.0 - 0.0 - 0.0 - 1.0 - - - PanelDefaultBackgroundColor - - Comment - Default Background Color - Persist - 1 - Type - Color4 - Value - - 0.24 - 0.24 - 0.24 - 0.55 - - - PanelDefaultHighlightLight - - Comment - Default Highlight Light - Persist - 1 - Type - Color4 - Value - - 0.45 - 0.52 - 0.61 - 1 - - - PanelFocusBackgroundColor - - Comment - Focus Background Color - Persist - 1 - Type - Color4 - Value - - 0.24 - 0.24 - 0.24 - 1 - - - ParcelHoverColor - - Comment - Parcel Hover Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - PieMenuBgColor - - Comment - Pie Menu Bg Color - Persist - 1 - Type - Color4 - Value - - 0.24 - 0.24 - 0.24 - 0.59 - - - PieMenuLineColor - - Comment - Pie Menu Line Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 0.5 - - - PieMenuSelectedColor - - Comment - Pie Menu Selected Color - Persist - 1 - Type - Color4 - Value - - 0.72 - 0.72 - 0.74 - 0.3 - - - PropertyColorAuction - - Comment - Property Color Auction - Persist - 1 - Type - Color4 - Value - - 0.50 - 0 - 1 - 0.4 - - - PropertyColorAvail - - Comment - Property Color Avail - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 0 - - - PropertyColorForSale - - Comment - Property Color For Sale - Persist - 1 - Type - Color4 - Value - - 1 - 0.50 - 0 - 0.4 - - - PropertyColorGroup - - Comment - Property Color Group - Persist - 1 - Type - Color4 - Value - - 0 - 0.72 - 0.72 - 0.4 - - - PropertyColorOther - - Comment - Property Color Other - Persist - 1 - Type - Color4 - Value - - 1 - 0 - 0 - 0.4 - - - PropertyColorSelf - - Comment - Property Color Self - Persist - 1 - Type - Color4 - Value - - 0 - 1 - 0 - 0.4 - - - ScriptBgReadOnlyColor - - Comment - Script Bg Read Only Color - Persist - 1 - Type - Color4 - Value - - 0.39 - 0.39 - 0.39 - 1 - - - ScriptErrorColor - - Comment - Color of script error messages - Persist - 1 - Type - Color4 - Value - - 0.82 - 0.27 - 0.27 - 1.0 - - - ScrollBGStripeColor - - Comment - Scroll BGStripe Color - Persist - 1 - Type - Color4 - Value - - 0.334399998188018798828125 - 0.545599997043609619140625 - 0.51590001583099365234375 - 0.1599999964237213134765625 - - - ScrollBgReadOnlyColor - - Comment - Scroll Bg Read Only Color - Persist - 1 - Type - Color4 - Value - - 0.78 - 0.82 - 0.8 - 1 - - - ScrollBgWriteableColor - - Comment - Scroll Bg Writeable Color - Persist - 1 - Type - Color4 - Value - - 0.78 - 0.82 - 0.8 - 1 - - - ScrollDisabledColor - - Comment - Scroll Disabled Color - Persist - 1 - Type - Color4 - Value - - 0.5 - 0.5 - 0.5 - 0.8 - - - ScrollHighlightedColor - - Comment - Scroll Highlighted Color - Persist - 1 - Type - Color4 - Value - - 0.72 - 0.72 - 0.74 - 0.5 - - - ScrollHoveredColor - - Comment - Scroll Hovered Color - Persist - 1 - Type - Color4 - Value - - 0.72 - 0.72 - 0.74 - 0.5 - - - ScrollSelectedBGColor - - Comment - Scroll Selected BGColor - Persist - 1 - Type - Color4 - Value - - 0.39 - 0.39 - 0.74 - 0.59 - - - ScrollSelectedFGColor - - Comment - Scroll Selected FGColor - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 0.8 - - - ScrollUnselectedColor - - Comment - Scroll Unselected Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 0.8 - - - ScrollbarThumbColor - - Comment - Scrollbar Thumb Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - ScrollbarTrackColor - - Comment - Scrollbar Track Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - SilhouetteChildColor - - Comment - Silhouette Child Color - Persist - 1 - Type - Color4 - Value - - 0.13 - 0.42 - 0.77 - 1 - - - SilhouetteParentColor - - Comment - Silhouette Parent Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 0 - 1 - - - SliderDisabledThumbColor - - Comment - Slider Disabled Thumb Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - SliderThumbCenterColor - - Comment - Slider Thumb Center Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - SliderThumbOutlineColor - - Comment - Slider Thumb Outline Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - SliderTrackColor - - Comment - Slider Track Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - SpeakingColor - - Comment - Color of various indicators when resident is speaking on a voice channel. - Persist - 1 - Type - Color4 - Value - - 0.0 - 1.0 - 0.0 - 1.0 - - - SystemChatColor - - Comment - Color of chat messages from SL System - Persist - 1 - Type - Color4 - Value - - 0.800000011921 - 1.0 - 1.0 - 1.0 - - - TextBgFocusColor - - Comment - Text Bg Focus Color - Persist - 1 - Type - Color4 - Value - - 0.78 - 0.82 - 0.8 - 1 - - - TextBgReadOnlyColor - - Comment - Text Bg Read Only Color - Persist - 1 - Type - Color4 - Value - - 0.24 - 0.24 - 0.24 - 0.63 - - - TextBgWriteableColor - - Comment - Text Bg Writeable Color - Persist - 1 - Type - Color4 - Value - - 0.78 - 0.82 - 0.8 - 0.9 - - - TextCursorColor - - Comment - Text Cursor Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 1 - - - TextDefaultColor - - Comment - Text Default Color - Persist - 1 - Type - Color4 - Value - - 0 - 0.08 - 0 - 1 - - - TextEmbeddedItemColor - - Comment - Text Embedded Item Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0.5 - 1 - - - TextEmbeddedItemReadOnlyColor - - Comment - Text Embedded Item Read Only Color - Persist - 1 - Type - Color4 - Value - - 0.23 - 0.58 - 0.95 - 1 - - - TextFgColor - - Comment - Text Fg Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 1 - - - TextFgReadOnlyColor - - Comment - Text Fg Read Only Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 0.78 - - - TextFgTentativeColor - - Comment - Text Fg Tentative Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 0.5 - - - TimeTextColor - - Comment - Time Text Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 1 - - - TitleBarFocusColor - - Comment - Title Bar Focus Color - Persist - 1 - Type - Color4 - Value - - 1 - 1 - 1 - 0.12 - - - ToolTipBgColor - - Comment - Tool Tip Bg Color - Persist - 1 - Type - Color4 - Value - - 0.72 - 0.72 - 0.74 - 0.78 - - - ToolTipBorderColor - - Comment - Tool Tip Border Color - Persist - 1 - Type - Color4 - Value - - 0.67 - 0.83 - 0.96 - 1 - - - ToolTipTextColor - - Comment - Tool Tip Text Color - Persist - 1 - Type - Color4 - Value - - 0 - 0 - 0 - 1 - - - UserChatColor - - Comment - Color of your chat messages - Persist - 1 - Type - Color4 - Value - - 1.0 - 1.0 - 1.0 - 1.0 - - - llOwnerSayChatColor - - Comment - Color of chat messages from objects only visible to the owner - Persist - 1 - Type - Color4 - Value - - 0.99 - 0.99 - 0.67 - 1.0 - - - - + + + -- cgit v1.3