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

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

meow-7.2.2
Ansariel 2021-04-24 22:38:49 +02:00
parent f9a0387cf3 d07980268f
commit 0405613511
12 changed files with 55 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
autobuild.xml
View File

@ -1008,11 +1008,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>c8024bad0445af488d355670ba13cc40</string>
<string>65d60415962cf65918c4fabe379ad43a</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///opt/firestorm/fmodstudio-2.01.08-linux64-210441517.tar.bz2</string>
<string>file:///opt/firestorm/fmodstudio-2.01.09-linux64-211101316.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -1022,11 +1022,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>c27de9c2f8c562551773a80399d6d037</string>
<string>215de14980a03774795de8cde24f1ad5</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.08-windows-210431451.tar.bz2</string>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.09-windows-211090925.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1036,18 +1036,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>29a66f79f7224cc17aa22d047853f7b0</string>
<string>a55f9ae859a5a60285f0c6c764729194</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.08-windows64-210431454.tar.bz2</string>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.01.09-windows64-211090927.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>2.01.08</string>
<string>2.01.09</string>
</map>
<key>fontconfig</key>
<map>

2
indra/llmessage/llcachename.cpp
View File

@ -574,7 +574,7 @@ std::string LLCacheName::buildFullName(const std::string& first, const std::stri
std::string LLCacheName::cleanFullName(const std::string& full_name)
{
// <FS:CR> FIRE-6659: Legacy "Resident" name toggle
return (LLAvatarName::trimResidentSurname() ? full_name : full_name.substr(0, full_name.find(" Resident")));
return (!LLAvatarName::trimResidentSurname() ? full_name : full_name.substr(0, full_name.find(" Resident")));
// </FS:CR> FIRE-6659: Legacy "Resident" name toggle
}

4
indra/llui/llscrolllistcolumn.cpp
View File

@ -257,7 +257,7 @@ void LLScrollColumnHeader::updateResizeBars()
for (col = 0; col < mColumn->mParentCtrl->getNumColumns(); col++)
{
LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
if (columnp->mHeader && columnp->mHeader->canResize())
if (columnp && columnp->mHeader && columnp->mHeader->canResize())
{
num_resizable_columns++;
}
@ -269,7 +269,7 @@ void LLScrollColumnHeader::updateResizeBars()
for (col = 0; col < mColumn->mParentCtrl->getNumColumns(); col++)
{
LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
if (!columnp->mHeader) continue;
if (!columnp || !columnp->mHeader) continue;
BOOL enable = num_resizable_columns >= 2 && num_resizers_enabled < (num_resizable_columns - 1) && columnp->mHeader->canResize();
columnp->mHeader->enableResizeBar(enable);
if (enable)

4
indra/llui/llscrolllistctrl.cpp
View File

@ -833,12 +833,12 @@ void LLScrollListCtrl::updateColumns(bool force_update)
LLScrollColumnHeader* last_header = NULL;
for (column_ordered_it = mColumnsIndexed.begin(); column_ordered_it != mColumnsIndexed.end(); ++column_ordered_it)
{
if ((*column_ordered_it)->getWidth() < 0)
LLScrollListColumn* column = *column_ordered_it;
if (!column || column->getWidth() < 0)
{
// skip hidden columns
continue;
}
LLScrollListColumn* column = *column_ordered_it;
if (column->mHeader)
{

3
indra/llwindow/llwindowwin32.h
View File

@ -125,6 +125,9 @@ public:
/*virtual*/ void* getDirectInput8();
/*virtual*/ bool getInputDevices(U32 device_type_filter, void * di8_devices_callback, void* userdata);
U32 getRawWParam() { return mRawWParam; }
protected:
LLWindowWin32(LLWindowCallbacks* callbacks,
const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags,

12
indra/newview/llenvironment.cpp
View File

@ -2074,6 +2074,10 @@ void LLEnvironment::coroRequestEnvironment(S32 parcel_id, LLEnvironment::environ
{
LL_WARNS("ENVIRONMENT") << "Couldn't retrieve environment settings for " << ((parcel_id == INVALID_PARCEL_ID) ? ("region!") : ("parcel!")) << LL_ENDL;
}
else if (LLApp::isExiting())
{
return;
}
else
{
LLSD environment = result[KEY_ENVIRONMENT];
@ -2163,6 +2167,10 @@ void LLEnvironment::coroUpdateEnvironment(S32 parcel_id, S32 track_no, UpdateInf
notify = LLSD::emptyMap();
notify["FAIL_REASON"] = result["message"].asString();
}
else if (LLApp::isExiting())
{
return;
}
else
{
LLSD environment = result[KEY_ENVIRONMENT];
@ -2225,6 +2233,10 @@ void LLEnvironment::coroResetEnvironment(S32 parcel_id, S32 track_no, environmen
notify = LLSD::emptyMap();
notify["FAIL_REASON"] = result["message"].asString();
}
else if (LLApp::isExiting())
{
return;
}
else
{
LLSD environment = result[KEY_ENVIRONMENT];

14
indra/newview/llimprocessing.cpp
View File

@ -1280,7 +1280,19 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
// group is not blocked, but we still need to check agent that sent the invitation
// and we have no agent's id
// Note: server sends username "first.last".
is_muted |= LLMuteList::getInstance()->isMuted(name);
// <FS:Ansariel> Fix broken mute check for avatars without last name:
// Names without last names are stored with capital first letter
// in the mute list, but they arrive here completely in lower case.
// So we need to change the first letter to upper case in order to
// make the mute check actually work.
//is_muted |= LLMuteList::getInstance()->isMuted(name);
std::string check_name(name);
if (!check_name.empty() && check_name.find('.') == std::string::npos)
{
check_name[0] = toupper(check_name[0]);
}
is_muted |= LLMuteList::getInstance()->isMuted(check_name);
// </FS:Ansariel>
}
if (is_do_not_disturb || is_muted)
{

7
indra/newview/llviewerwindow.cpp
View File

@ -237,6 +237,7 @@
#if LL_WINDOWS
#include <tchar.h> // For Unicode conversion methods
#include "llwindowwin32.h" // For AltGr handling
#endif
#include "utilitybar.h" // <FS:Zi> Support for the classic V1 style buttons in some skins
@ -3191,9 +3192,11 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
// of character handling.
// Alt Gr can be additionally modified by Shift
const MASK alt_gr = MASK_CONTROL | MASK_ALT;
LLWindowWin32 *window = static_cast<LLWindowWin32*>(mWindow);
U32 raw_key = window->getRawWParam();
if ((mask & alt_gr) != 0
&& key >= 0x30
&& key <= 0x5A
&& ((raw_key >= 0x30 && raw_key <= 0x5A) //0-9, plus normal chartacters
|| (raw_key >= 0xBA && raw_key <= 0xE4)) // Misc/OEM characters that can be covered by AltGr, ex: -, =, ~
&& (GetKeyState(VK_RMENU) & 0x8000) != 0
&& (GetKeyState(VK_RCONTROL) & 0x8000) == 0) // ensure right control is not pressed, only left one
{

4
indra/newview/skins/default/xui/en/floater_about.xml
View File

@ -91,7 +91,7 @@ Dummy Name replaced at run time
</text_editor>
</panel>
<panel
height="855"
height="885"
border="true"
label="Firestorm Credits"
help_topic="about_fscredits_tab"
@ -156,7 +156,7 @@ Additional code generously contributed to Firestorm by:
<text
enabled="false"
follows="top|left"
height="185"
height="215"
bg_readonly_color="Transparent"
left="5"
text_color="LtGray"

4
indra/newview/skins/default/xui/fr/floater_select_key.xml
View File

@ -7,7 +7,7 @@
Boutons de la souris
</floater.string>
<floater.string name="basic_description">
Appuyez sur une touche ou un bouton de la souris pour régler votre déclencheur..
Appuyez sur une touche ou un bouton de la souris pour régler votre déclencheur.
Saisie autorisée : [INPUT].
</floater.string>
<floater.string name="reserved_by_menu">
@ -17,7 +17,7 @@ Saisie autorisée : [INPUT].
Appuyez sur une touche ou un bouton de la souris pour régler votre déclencheur.
Saisie autorisée : [INPUT].
</text>
<check_box label="Appliquer à tous" name="apply_all" tool_tip="Viewer uses different control combinations depending on what you are doing in world, setting this will apply your change to all combinations"/>
<check_box label="Appliquer à tous" name="apply_all" tool_tip="La visionneuse utilise différentes combinaisons de commandes en fonction de ce que vous faites en ligne. En cochant cette option, vous appliquerez vos modifications à toutes les combinaisons."/>
<button label="Vide" name="SetEmpty"/>
<button label="Défaut" name="Default"/>
<button label="Annuler" name="Cancel"/>

5
indra/newview/skins/default/xui/fr/menu_hide_navbar.xml
View File

@ -7,4 +7,9 @@
<menu_item_check label="Afficher la version du simulateur dans la barre supérieure" name="FSStatusbarShowSimulatorVersion"/>
<menu_item_check label="Afficher la recherche dans les menus" name="FSMenuSearch"/>
<menu_item_check label="Afficher le solde de devises" name="FSShowCurrencyBalanceInStatusbar"/>
<menu_item_check label="Afficher les contrôles des médias" name="FSEnableVolumeControls"/>
<menu_item_check label="Afficher le nombre d'images par seconde" name="FSStatusBarShowFPS"/>
<menu_item_check label="Afficher l'indicateur de trafic" name="ShowNetStats"/>
<menu_item_check label="Afficher les coordonnées" name="Coordinates"/>
<menu_item_check label="Afficher les autorisations de la parcelle" name="Parcel Properties"/>
</menu>

2
indra/newview/skins/default/xui/ru/floater_live_lsleditor.xml
View File

@ -27,6 +27,6 @@
<button label="Сброс" label_selected="Сброс" name="Reset"/>
<check_box initial_value="true" label="Выполняется" name="running"/>
<check_box initial_value="true" label="Моно" name="mono"/>
<check_box label="Использовать приключение:" name="enable_xp"/>
<check_box label="Исп. приключение:" name="enable_xp"/>
<button label="&gt;" name="view_profile"/>
</floater>