diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-17 19:49:37 +0300 | 
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-08-17 19:50:16 +0300 | 
| commit | 74a1d2582c457aff738bf73c21e137015acfe6cb (patch) | |
| tree | 8ea23c362debf4cd78675187a8d9efa7fdaac579 | |
| parent | fa5af90e30aaaf638d5083dff6258a66da06c00c (diff) | |
SL-20162 Better cof version logging
And fixed some typos
| -rw-r--r-- | indra/newview/llaisapi.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llinventorymodelbackgroundfetch.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llpanellandmarkinfo.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llpanellandmarkinfo.h | 2 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 9 | 
5 files changed, 17 insertions, 10 deletions
| diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp index 4546574955..d8d30037c8 100644 --- a/indra/newview/llaisapi.cpp +++ b/indra/newview/llaisapi.cpp @@ -1646,7 +1646,7 @@ void AISUpdate::doUpdate()  		gInventory.updateCategory(new_category, LLInventoryObserver::CREATE);  		LL_DEBUGS("Inventory") << "created category " << category_id << LL_ENDL; -        // fetching can receive massive amount of items and fodlers +        // fetching can receive massive amount of items and folders          if (gInventory.getChangedIDs().size() > MAX_UPDATE_BACKLOG)          {              gInventory.notifyObservers(); @@ -1707,7 +1707,7 @@ void AISUpdate::doUpdate()  		LL_DEBUGS("Inventory") << "created item " << item_id << LL_ENDL;  		gInventory.updateItem(new_item, LLInventoryObserver::CREATE); -        // fetching can receive massive amount of items and fodlers +        // fetching can receive massive amount of items and folders          if (gInventory.getChangedIDs().size() > MAX_UPDATE_BACKLOG)          {              gInventory.notifyObservers(); diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index 03205cfbda..44eccd955e 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -657,7 +657,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()          || mLastFetchCount != mFetchCount) // if anything was substracted      {          LL_DEBUGS(LOG_INV , "AIS3") << "Total active fetches: " << mLastFetchCount << "->" << last_fetch_count << "->" << mFetchCount -            << ", scheduled fodler fetches: " << (S32)mFetchFolderQueue.size() +            << ", scheduled folder fetches: " << (S32)mFetchFolderQueue.size()              << ", scheduled item fetches: " << (S32)mFetchItemQueue.size()              << LL_ENDL;          mLastFetchCount = mFetchCount; @@ -1384,10 +1384,10 @@ void BGFolderHttpHandler::processFailure(LLCore::HttpStatus status, LLCore::Http              while (iter != end)              {                  folders.append(*iter); -                LLUUID fodler_id = iter->get("folder_id").asUUID(); -                if (std::find(mRecursiveCatUUIDs.begin(), mRecursiveCatUUIDs.end(), fodler_id) != mRecursiveCatUUIDs.end()) +                LLUUID folder_id = iter->get("folder_id").asUUID(); +                if (std::find(mRecursiveCatUUIDs.begin(), mRecursiveCatUUIDs.end(), folder_id) != mRecursiveCatUUIDs.end())                  { -                    recursive_cats.push_back(fodler_id); +                    recursive_cats.push_back(folder_id);                  }                  if (folders.size() == (S32)(size / 2))                  { diff --git a/indra/newview/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp index 834e664723..cc3c51dd83 100644 --- a/indra/newview/llpanellandmarkinfo.cpp +++ b/indra/newview/llpanellandmarkinfo.cpp @@ -111,9 +111,9 @@ void LLPanelLandmarkInfo::setInfoType(EInfoType type)  }  // Sets CREATE_LANDMARK infotype and creates landmark at desired folder -void LLPanelLandmarkInfo::setInfoAndCreateLandmark(const LLUUID& fodler_id) +void LLPanelLandmarkInfo::setInfoAndCreateLandmark(const LLUUID& folder_id)  { -    setInfoType(CREATE_LANDMARK, fodler_id); +    setInfoType(CREATE_LANDMARK, folder_id);  }  void LLPanelLandmarkInfo::setInfoType(EInfoType type, const LLUUID &folder_id) diff --git a/indra/newview/llpanellandmarkinfo.h b/indra/newview/llpanellandmarkinfo.h index 46e2a1935b..8802ce066e 100644 --- a/indra/newview/llpanellandmarkinfo.h +++ b/indra/newview/llpanellandmarkinfo.h @@ -48,7 +48,7 @@ public:  	/*virtual*/ void setInfoType(EInfoType type);      // Sets CREATE_LANDMARK infotype and creates landmark at desired folder -    void setInfoAndCreateLandmark(const LLUUID& fodler_id); +    void setInfoAndCreateLandmark(const LLUUID& folder_id);  	/*virtual*/ void processParcelInfo(const LLParcelData& parcel_data); diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 305c489cc8..57a78181bd 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -9447,7 +9447,14 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )  	// RequestAgentUpdateAppearanceResponder::onRequestRequested()  	// assumes that cof version is only updated with server-bake  	// appearance messages. -    LL_INFOS("Avatar") << "Processing appearance message version " << thisAppearanceVersion << LL_ENDL; +    if (isSelf()) +    { +        LL_INFOS("Avatar") << "Processing appearance message version " << thisAppearanceVersion << LL_ENDL; +    } +    else +    { +        LL_INFOS("Avatar") << "Processing appearance message for " << getID() << ", version " << thisAppearanceVersion << LL_ENDL; +    }      // Note:      // locally the COF is maintained via LLInventoryModel::accountForUpdate | 
