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

Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer

master
Ansariel 2022-11-22 16:30:35 +01:00
parent 8f45ad9323 e231b6d8d3
commit a7d55b4e77
4 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
autobuild.xml
View File

@ -540,9 +540,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>b6357ef3a0ec37877a5831820f25094e</string>
<string>178b16ee9ff67986c8c14413ee68218e</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80557/759704/apr_suite-1.4.5.558565-darwin64-558565.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107593/938535/apr_suite-1.4.5.576669-darwin64-576669.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -564,9 +564,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>cb48ac069440f6dcd564cfa9fd02a4c2</string>
<string>d2997cad03dbd0d70a060276b5671480</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80556/759710/apr_suite-1.4.5.558565-windows-558565.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107594/938548/apr_suite-1.4.5.576669-windows-576669.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -576,16 +576,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>646dc3828d9c39fb1e77c4eec44ed739</string>
<string>ec24f5945faa8f13807b83eeaeb994f8</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/80555/759709/apr_suite-1.4.5.558565-windows64-558565.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107592/938547/apr_suite-1.4.5.576669-windows64-576669.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.4.5.558565</string>
<string>1.4.5.576669</string>
</map>
<key>boost</key>
<map>
@ -1892,9 +1892,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>c1c9e32e21f3c34d91ed045b2ca91f24</string>
<string>7a0059748d0b8733f2f9ce434cf604b8</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87781/805801/libpng-1.6.8.563850-darwin64-563850.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107514/937867/libpng-1.6.38.576621-darwin64-576621.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -1916,9 +1916,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>642e9cf95c8ccd0eb34f6d7a40df585a</string>
<string>3112013186ad60b0fc270a398d4dd499</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87782/805831/libpng-1.6.8.563850-windows-563850.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107513/937823/libpng-1.6.38.576621-windows-576621.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1928,16 +1928,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>ce46aa0f171d97626c4a3940347cecd7</string>
<string>7c6bfcdb0d6162587cdbc436f595dd02</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/87780/805832/libpng-1.6.8.563850-windows64-563850.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/107512/937822/libpng-1.6.38.576621-windows64-576621.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>1.6.8.563850</string>
<string>1.6.38.576621</string>
</map>
<key>libuuid</key>
<map>

10
indra/llui/lltabcontainer.cpp
View File

@ -1583,12 +1583,10 @@ void LLTabContainer::selectLastTab()
void LLTabContainer::selectNextTab()
{
// <FS:Ansariel> FIRE-15580: Crash fix (division by 0)
if (mTabList.size() == 0)
{
return;
}
// </FS:Ansariel>
if (mTabList.size() == 0)
{
return;
}
BOOL tab_has_focus = FALSE;
if (mCurrentTabIdx >= 0 && mTabList[mCurrentTabIdx]->mButton->hasFocus())

8
indra/newview/llkeyconflict.cpp
View File

@ -171,8 +171,9 @@ bool LLKeyConflictHandler::isReservedByMenu(const KEY &key, const MASK &mask)
{
return false;
}
return (gMenuBarView && gMenuBarView->hasAccelerator(key, mask))
|| (gLoginMenuBarView && gLoginMenuBarView->hasAccelerator(key, mask));
// At the moment controls are only applicable inworld,
// ignore gLoginMenuBarView
return gMenuBarView && gMenuBarView->hasAccelerator(key, mask);
}
// static
@ -182,8 +183,7 @@ bool LLKeyConflictHandler::isReservedByMenu(const LLKeyData &data)
{
return false;
}
return (gMenuBarView && gMenuBarView->hasAccelerator(data.mKey, data.mMask))
|| (gLoginMenuBarView && gLoginMenuBarView->hasAccelerator(data.mKey, data.mMask));
return gMenuBarView && gMenuBarView->hasAccelerator(data.mKey, data.mMask);
}
bool LLKeyConflictHandler::registerControl(const std::string &control_name, U32 index, EMouseClickType mouse, KEY key, MASK mask, bool ignore_mask)

2
indra/newview/llstartup.cpp
View File

@ -318,12 +318,10 @@ void show_release_notes_if_required();
bool first_run_dialog_callback(const LLSD& notification, const LLSD& response);
void set_startup_status(const F32 frac, const std::string& string, const std::string& msg);
bool login_alert_status(const LLSD& notification, const LLSD& response);
void login_packet_failed(void**, S32 result);
void use_circuit_callback(void**, S32 result);
void register_viewer_callbacks(LLMessageSystem* msg);
void asset_callback_nothing(const LLUUID&, LLAssetType::EType, void*, S32);
bool callback_choose_gender(const LLSD& notification, const LLSD& response);
void init_start_screen(S32 location_id);
void release_start_screen();
void reset_login();
LLSD transform_cert_args(LLPointer<LLCertificate> cert);