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

Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer 

# Conflicts:
#	autobuild.xml
meow-7.2.2
Ansariel 2023-08-24 20:18:42 +02:00
parent 2d64a54b1e 2d27a6ac31
commit 195834eec3
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autobuild.xml
View File

@ -2082,18 +2082,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>d6e7ab8483c348f223fd24028e27a52f</string>
<string>3a45d167f60ed26dc1f8467b93ec64676cc7fe34</string>
<key>hash_algorithm</key>
<string>md5</string>
<string>sha1</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/93933/844890/llca-202202010217.567974-common-567974.tar.bz2</string>
<string>https://github.com/secondlife/llca/releases/download/v202305121625.0-efdf149/llca-202305160024.0-common-efdf149.tar.zst</string>
</map>
<key>name</key>
<string>common</string>
</map>
</map>
<key>version</key>
<string>202202010217.567974</string>
<string>202305160024.0</string>
</map>
<key>llphysicsextensions_source</key>
<map>

1
indra/llcommon/llcoros.cpp
View File

@ -281,6 +281,7 @@ std::string LLCoros::launch(const std::string& prefix, const callable_t& callabl
catch (std::bad_alloc&)
{
// Out of memory on stack allocation?
printActiveCoroutines();
LL_ERRS("LLCoros") << "Bad memory allocation in LLCoros::launch(" << prefix << ")!" << LL_ENDL;
}

15
indra/newview/llavatarrenderinfoaccountant.cpp
View File

@ -79,8 +79,14 @@ void LLAvatarRenderInfoAccountant::avatarRenderInfoGetCoro(std::string url, U64
LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("AvatarRenderInfoAccountant", httpPolicy));
LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
LLCore::HttpOptions::ptr_t httpOpts(new LLCore::HttpOptions);
LLSD result = httpAdapter->getAndSuspend(httpRequest, url);
// Going to request each 15 seconds either way, so don't wait
// too long and don't repeat
httpOpts->setRetries(0);
httpOpts->setTimeout(SECS_BETWEEN_REGION_REQUEST);
LLSD result = httpAdapter->getAndSuspend(httpRequest, url, httpOpts);
LLWorld *world_inst = LLWorld::getInstance();
if (!world_inst)
@ -190,6 +196,11 @@ void LLAvatarRenderInfoAccountant::avatarRenderInfoReportCoro(std::string url, U
LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("AvatarRenderInfoAccountant", httpPolicy));
LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
LLCore::HttpOptions::ptr_t httpOpts(new LLCore::HttpOptions);
// Going to request each 60+ seconds, timeout is 30s.
// Don't repeat too often, will be sending newer data soon
httpOpts->setRetries(1);
LLWorld *world_inst = LLWorld::getInstance();
if (!world_inst)
@ -256,7 +267,7 @@ void LLAvatarRenderInfoAccountant::avatarRenderInfoReportCoro(std::string url, U
regionp = NULL;
world_inst = NULL;
LLSD result = httpAdapter->postAndSuspend(httpRequest, url, report);
LLSD result = httpAdapter->postAndSuspend(httpRequest, url, report, httpOpts);
world_inst = LLWorld::getInstance();
if (!world_inst)

2
indra/newview/llfloaterpreference.cpp
View File

@ -431,7 +431,7 @@ public:
}
bool handle(const LLSD& params, const LLSD& query_map,
LLMediaCtrl* web)
const std::string& grid, LLMediaCtrl* web)
{
if (params.size() < 1) return false;

4
indra/newview/llinventorymodel.cpp
View File

@ -663,9 +663,7 @@ const LLUUID LLInventoryModel::findCategoryUUIDForTypeInRoot(
if(rv.isNull()
&& root_id.notNull()
&& create_folder
&& preferred_type != LLFolderType::FT_MARKETPLACE_LISTINGS
&& preferred_type != LLFolderType::FT_OUTBOX)
&& create_folder)
{
if (isInventoryUsable())

2
indra/newview/llviewerinput.cpp
View File

@ -1120,7 +1120,7 @@ bool LLViewerInput::modeFromString(const std::string& string, S32 *mode)
}
S32 val = atoi(string.c_str());
if (val >= 0 || val < MODE_COUNT)
if (val >= 0 && val < MODE_COUNT)
{
*mode = val;
return true;