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

Merge branch 'master' of ssh://vcs.firestormviewer.org/phoenix-firestorm

meow-7.2.2
Nicky 2020-07-17 21:28:03 +02:00
parent 1a38b26f5c 1af77b7024
commit f934f3e86e
8 changed files with 82 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
autobuild.xml
View File

@ -1006,11 +1006,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>b5b6897fb6f5413f3396b0666a6422ab</string>
<string>371025cc40f8cbb70f0bb88f79a906a6</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///opt/firestorm/fmodstudio-2.00.08-darwin-201031332.tar.bz2</string>
<string>file:///opt/firestorm/fmodstudio-2.01.02-darwin-201981618.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@ -1034,11 +1034,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>5c182fe2303511c35480d00d9b6832dc</string>
<string>469f3e3a177c089deacad40428d23997</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.01-windows-201411851.tar.bz2</string>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.02-windows-201991756.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1048,18 +1048,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>10fcd058ec0da77273c61aca78081ede</string>
<string>59766e450e7395fe996ae17c8c267c76</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.01-windows64-201412005.tar.bz2</string>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.02-windows64-201991757.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>2.01.01</string>
<string>2.01.02</string>
</map>
<key>fontconfig</key>
<map>
@ -3476,9 +3476,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>e5a4261599f47045428b520b20405022</string>
<string>e5635e173c75dc0675b48ab5f5e4868b</string>
<key>url</key>
<string>http://downloads.phoenixviewer.com/vlc_bin-3.0.8.200601940-darwin64-200601940.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12143/71451/vlc_bin-2.2.8.511703-darwin64-511703.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>

2
indra/llui/llscrolllistcell.cpp
View File

@ -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; // <FS:Ansariel> Add some padding pixels for better readability
break;
case LLFontGL::RIGHT:
start_x = (F32)getWidth();

5
indra/llui/llstyle.cpp
View File

@ -42,7 +42,10 @@ LLStyle::Params::Params()
image("image"),
link_href("href"),
is_link("is_link"),
is_name_slurl("is_name_slurl") // <FS:CR> FIRE-11330
// <FS:Ansariel> 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)
// </FS:Ansariel>
{}

5
indra/llui/llstyle.h
View File

@ -48,7 +48,10 @@ public:
Optional<LLUIImage*> image;
Optional<std::string> link_href;
Optional<bool> is_link;
Optional<bool> is_name_slurl; // <FS:CR> FIRE-11330
// <FS:Ansariel> Don't highlight URLs on hover if font style contains underline
Optional<bool> use_default_link_style;
Optional<bool> is_chat_header;
// </FS:Ansariel>
Params();
};
LLStyle(const Params& p = Params());

20
indra/llui/lltextbase.cpp
View File

@ -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);
// <FS:CR> FIRE-11330 - if it's a name, don't stylize it like a url
if (!input_params.is_name_slurl)
// <FS:Ansariel> 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;
}
}
// </FS:Ansariel>
// output the text before the Url
if (start > 0)
@ -2297,7 +2309,7 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para
// <FS:CR> 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);
// </FS:CR>
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);
// </FS:Ansariel>
// set the tooltip for the query part of url

5
indra/newview/fschathistory.cpp
View File

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

32
indra/newview/llviewermenu.cpp
View File

@ -10787,6 +10787,38 @@ class LLWorldEnvSettings : public view_listener_t
// [/RLVa:KB]
std::string event_name = userdata.asString();
// <FS:Beq> FIRE-29785 fix daytime shortcuts for non-EEP
#ifdef OPENSIM
static std::map<std::string, std::string> 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
// </FS:Beq>
if (event_name == "sunrise")
{

14
indra/newview/quickprefs.cpp
View File

@ -345,7 +345,8 @@ void FloaterQuickPrefs::loadSkyPresets(const std::multimap<std::string, LLUUID>&
{
// 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);