Merge branch 'main' of https://github.com/secondlife/viewer

indra/newview/VIEWER_VERSION.txt

@@ -1 +1 @@
-6.6.15
+6.6.16

indra/newview/llfloaterforgetuser.cpp

@@ -164,6 +164,12 @@ bool LLFloaterForgetUser::onConfirmLogout(const LLSD& notification, const LLSD&
     if (option == 0)
     {
         // Remove creds
+        std::string grid_id = LLGridManager::getInstance()->getGridId(grid);
+        if (grid_id.empty())
+        {
+            grid_id = grid;
+        }
+        gSecAPIHandler->removeFromProtectedMap("mfa_hash", grid_id, LLStartUp::getUserId()); // doesn't write
         gSecAPIHandler->removeFromCredentialMap("login_list", grid, LLStartUp::getUserId());
 
         LLPointer<LLCredential> cred = gSecAPIHandler->loadCredential(grid);

indra/newview/llinventorybridge.cpp

@@ -3278,7 +3278,10 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
                      move_it != move_inv->mMoveList.end();
                      ++move_it)
                 {
-                    cb->fire(move_it->second);
+                    if (cb)
+                    {
+                        cb->fire(move_it->second);
+                    }
                 }
             };
 			accept = move_inv_category_world_to_agent(cat_id, mUUID, drop, callback, NULL, filter);

indra/newview/llinventorymodelbackgroundfetch.cpp

@@ -1029,7 +1029,8 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis(const FetchQueueInfo& fetc
                 else
                 {
                     // Already fetched, check if anything inside needs fetching
-                    if (fetch_info.mFetchType == FT_RECURSIVE)
+                    if (fetch_info.mFetchType == FT_RECURSIVE
+                        || fetch_info.mFetchType == FT_FOLDER_AND_CONTENT)
                     {
                         LLInventoryModel::cat_array_t * categories(NULL);
                         LLInventoryModel::item_array_t * items(NULL);

indra/newview/llsidepaneliteminfo.cpp

@@ -261,6 +261,17 @@ void LLSidepanelItemInfo::refresh()
         }
 		return;
 	}
+
+    if (mObjectID.notNull())
+    {
+        LLViewerObject* object = gObjectList.findObject(mObjectID);
+        if (object)
+        {
+            // Object exists, but object's content is not nessesary
+            // loaded, so assume item exists as well
+            return;
+        }
+    }
     
     if (mParentFloater)
     {

indra/newview/lltexturectrl.cpp

@@ -178,6 +178,7 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
 	mSelectedItemPinned( FALSE ),
 	mCanApply(true),
 	mCanPreview(true),
+    mLimitsSet(false),
     mMaxDim(S32_MAX),
     mMinDim(0),
 	mPreviewSettingChanged(false),
@@ -330,7 +331,7 @@ bool LLFloaterTexturePicker::updateImageStats()
         S32 height = mTexturep->getFullHeight();
 		if (width > 0 && height > 0)
 		{
-            if (width != height
+            if ((mLimitsSet && (width != height))
                 || width < mMinDim
                 || width > mMaxDim
                 || height < mMinDim
@@ -1348,6 +1349,7 @@ void LLFloaterTexturePicker::setCanApply(bool can_preview, bool can_apply, bool
 void LLFloaterTexturePicker::setMinDimentionsLimits(S32 min_dim)
 {
     mMinDim = min_dim;
+    mLimitsSet = true;
 
     std::string formatted_dims = llformat("%dx%d", mMinDim, mMinDim);
     mResolutionWarning->setTextArg("[MINTEXDIM]", formatted_dims);

indra/newview/lltexturectrl.h

@@ -428,6 +428,7 @@ private:
 	bool mCanApply;
 	bool mCanPreview;
 	bool mPreviewSettingChanged;
+    bool mLimitsSet;
     S32 mMaxDim;
     S32 mMinDim;
 

indra/newview/llviewerobject.cpp

@@ -6221,7 +6221,7 @@ LLViewerObject::ExtraParameter* LLViewerObject::createNewParameterEntry(U16 para
       }
 	  default:
 	  {
-		  LL_INFOS() << "Unknown param type." << LL_ENDL;
+		  LL_INFOS_ONCE() << "Unknown param type: " << param_type << LL_ENDL;
 		  break;
 	  }
 	};