diff --git a/autobuild.xml b/autobuild.xml
index 06edbfb812..1eec9d255d 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -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>
diff --git a/indra/llcommon/llcoros.cpp b/indra/llcommon/llcoros.cpp
index f91f17c491..427377229a 100644
--- a/indra/llcommon/llcoros.cpp
+++ b/indra/llcommon/llcoros.cpp
@@ -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;
     }
 
diff --git a/indra/newview/llavatarrenderinfoaccountant.cpp b/indra/newview/llavatarrenderinfoaccountant.cpp
index 293c9d60a1..a6c9a41fa4 100644
--- a/indra/newview/llavatarrenderinfoaccountant.cpp
+++ b/indra/newview/llavatarrenderinfoaccountant.cpp
@@ -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)
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 71da61e92c..775ec6e0fe 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -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;
 
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 999e95ca2b..84d6584c63 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -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())
diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp
index ba8019cf85..4610d4f226 100644
--- a/indra/newview/llviewerinput.cpp
+++ b/indra/newview/llviewerinput.cpp
@@ -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;