diff --git a/autobuild.xml b/autobuild.xml index f7f38fc516..17a8da71fb 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1006,11 +1006,11 @@ archive hash - b5b6897fb6f5413f3396b0666a6422ab + 371025cc40f8cbb70f0bb88f79a906a6 hash_algorithm md5 url - file:///opt/firestorm/fmodstudio-2.00.08-darwin-201031332.tar.bz2 + file:///opt/firestorm/fmodstudio-2.01.02-darwin-201981618.tar.bz2 name darwin @@ -1034,11 +1034,11 @@ archive hash - 5c182fe2303511c35480d00d9b6832dc + 469f3e3a177c089deacad40428d23997 hash_algorithm md5 url - file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.01-windows-201411851.tar.bz2 + file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.02-windows-201991756.tar.bz2 name windows @@ -1048,18 +1048,18 @@ archive hash - 10fcd058ec0da77273c61aca78081ede + 59766e450e7395fe996ae17c8c267c76 hash_algorithm md5 url - file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.01-windows64-201412005.tar.bz2 + file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.02-windows64-201991757.tar.bz2 name windows64 version - 2.01.01 + 2.01.02 fontconfig @@ -3476,9 +3476,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - e5a4261599f47045428b520b20405022 + e5635e173c75dc0675b48ab5f5e4868b url - http://downloads.phoenixviewer.com/vlc_bin-3.0.8.200601940-darwin64-200601940.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12143/71451/vlc_bin-2.2.8.511703-darwin64-511703.tar.bz2 name darwin64 diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp index 8000efad0e..d72660245f 100644 --- a/indra/llui/llscrolllistcell.cpp +++ b/indra/llui/llscrolllistcell.cpp @@ -319,7 +319,7 @@ void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_col switch(mFontAlignment) { case LLFontGL::LEFT: - start_x = 0.f; + start_x = 5.f;//0.f; // Add some padding pixels for better readability break; case LLFontGL::RIGHT: start_x = (F32)getWidth(); diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp index 3d1820059c..8c4d3a5c6b 100644 --- a/indra/llui/llstyle.cpp +++ b/indra/llui/llstyle.cpp @@ -42,7 +42,10 @@ LLStyle::Params::Params() image("image"), link_href("href"), is_link("is_link"), - is_name_slurl("is_name_slurl") // FIRE-11330 + // Don't highlight URLs on hover if font style contains underline + use_default_link_style("use_default_link_style", true), + is_chat_header("is_chat_header", false) + // {} diff --git a/indra/llui/llstyle.h b/indra/llui/llstyle.h index 784a3c9ba1..2fe9117509 100644 --- a/indra/llui/llstyle.h +++ b/indra/llui/llstyle.h @@ -48,7 +48,10 @@ public: Optional image; Optional link_href; Optional is_link; - Optional is_name_slurl; // FIRE-11330 + // Don't highlight URLs on hover if font style contains underline + Optional use_default_link_style; + Optional is_chat_header; + // Params(); }; LLStyle(const Params& p = Params()); diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 61bb4f8fc9..d0f4f69023 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2256,9 +2256,21 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para end = match.getEnd()+1; LLStyle::Params link_params(style_params); - // FIRE-11330 - if it's a name, don't stylize it like a url - if (!input_params.is_name_slurl) + // Overwrite only if we explicitly allow it + //link_params.overwriteFrom(match.getStyle()); + if (input_params.use_default_link_style) + { + LLUIColor color(link_params.color()); + LLUIColor readonly_color(link_params.readonly_color()); + bool is_chat_header = link_params.is_chat_header(); link_params.overwriteFrom(match.getStyle()); + if (is_chat_header) + { + link_params.color = color; + link_params.readonly_color = readonly_color; + } + } + // // output the text before the Url if (start > 0) @@ -2297,7 +2309,7 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para // FIRE-11437 - Don't supress font style for chat history name links //appendAndHighlightTextImpl(match.getLabel(), part, link_params, match.underlineOnHoverOnly()); appendAndHighlightTextImpl(match.getLabel(), part, link_params, - input_params.is_name_slurl ? false : match.underlineOnHoverOnly()); + input_params.use_default_link_style ? match.underlineOnHoverOnly() : false); // bool tooltip_required = !match.getTooltip().empty(); @@ -2318,7 +2330,7 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para static LLUIColor query_part_color = LLUIColorTable::getInstance()->getColor("UriQueryPartColor", LLColor4::grey); link_params.color = query_part_color; link_params.readonly_color = query_part_color; - appendAndHighlightTextImpl(label, part, link_params, input_params.is_name_slurl ? false : match.underlineOnHoverOnly()); + appendAndHighlightTextImpl(label, part, link_params, input_params.use_default_link_style ? match.underlineOnHoverOnly() : false); // // set the tooltip for the query part of url diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp index 93d7526116..f272320aa9 100644 --- a/indra/newview/fschathistory.cpp +++ b/indra/newview/fschathistory.cpp @@ -1258,6 +1258,7 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL LLStyle::Params name_params(body_message_params); name_params.color(name_color); name_params.readonly_color(name_color); + name_params.is_chat_header(true); // FS:LO FIRE-2899 - Faded text for IMs in nearby chat F32 FSIMChatHistoryFade = gSavedSettings.getF32("FSIMChatHistoryFade"); @@ -1448,8 +1449,8 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL prependNewLineState = false; } } - - name_params.is_name_slurl = true; + + name_params.use_default_link_style = (!moderator_style_active || moderator_name_style_value == 0); name_params.link_href = LLSLURL("agent", chat.mFromID, "inspect").getSLURLString(); if (from_me && gSavedSettings.getBOOL("FSChatHistoryShowYou")) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index d45d1e3f84..53e79e46f5 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -10787,6 +10787,38 @@ class LLWorldEnvSettings : public view_listener_t // [/RLVa:KB] std::string event_name = userdata.asString(); +// FIRE-29785 fix daytime shortcuts for non-EEP +#ifdef OPENSIM + static std::map sky_presets = { + {"sunrise", "Sunrise"}, + {"noon", "Midday"}, + {"sunset", "Sunset"}, + {"midnight", "Midnight"} + }; + auto it = sky_presets.find(event_name); + if( LLGridManager::getInstance()->isInOpenSim() && + !LLEnvironment::instance().isExtendedEnvironmentEnabled() && + it != sky_presets.end() + ) + { + LLSettingsSky::ptr_t legacysky = nullptr; + LLSD messages; + legacysky = LLEnvironment::createSkyFromLegacyPreset(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", "skies", it->second + ".xml"), messages); + if (legacysky) + { + LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_LOCAL, legacysky); + LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL); + LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_FAST, true); + defocusEnvFloaters(); + } + else + { + LL_WARNS() << "Legacy windlight conversion failed for " << it->second << " existing env unchanged." << LL_ENDL; + } + return true; + } +#endif +// if (event_name == "sunrise") { diff --git a/indra/newview/quickprefs.cpp b/indra/newview/quickprefs.cpp index d787bef23a..6334549f51 100644 --- a/indra/newview/quickprefs.cpp +++ b/indra/newview/quickprefs.cpp @@ -345,7 +345,8 @@ void FloaterQuickPrefs::loadSkyPresets(const std::multimap& { // we add by name and only build the envp on demand LL_DEBUGS("WindlightCaps") << "Adding legacy sky " << preset_name << LL_ENDL; - mWLPresetsCombo->add(preset_name, LLSD(preset_name)); + // append "WL" to denote legacy. Have to create a new string not update the reference. + mWLPresetsCombo->add(preset_name+ "[WL]", LLSD(preset_name)); } LL_DEBUGS("WindlightCaps") << "Done: Adding legacy sky presets to QP" << LL_ENDL; } @@ -1163,6 +1164,17 @@ void FloaterQuickPrefs::updateRlvRestrictions(ERlvBehaviour behavior, ERlvParamT } } +// void FloaterQuickPrefs::onSunMoved() +// { + +// F32 val = mWLSunPos->getCurSliderValue(); + +// auto env = LLEnvironment::instance().getSelectedEnvironment() == LLEnvironment::ENV_LOCAL) +// auto day = LLEnvironment::instance().getEnvironmentDay(env); + + +// } + void FloaterQuickPrefs::enableWindlightButtons(bool enable) { childSetEnabled("WLPresetsCombo", enable);