From f4f30dae0f173517fa1cd58cead142d60cbcc839 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 8 Aug 2016 21:31:11 +0300 Subject: MAINT-6612 Server release notes in Help -> About Second Life never fetch on any region. --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 1daee0f92b..d968e80250 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -198,6 +198,7 @@ Ansariel Hiller MAINT-6552 STORM-2133 MAINT-6511 + MAINT-6612 Aralara Rajal Arare Chantilly CHUIBUG-191 -- cgit v1.3 From d85bc7de7f03a4629f0108c076cf3242466a8a3f Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 16 Aug 2016 17:48:52 +0300 Subject: MAINT-6637 DebugAvatarAppearanceMessage incorrectly reports all avatars received COF version as -1 --- doc/contributions.txt | 1 + indra/newview/llvoavatar.cpp | 17 +++++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index d968e80250..b3d1c2432d 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -199,6 +199,7 @@ Ansariel Hiller STORM-2133 MAINT-6511 MAINT-6612 + MAINT-6637 Aralara Rajal Arare Chantilly CHUIBUG-191 diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index aebc066507..f79249d6fa 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -7392,16 +7392,13 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys ) // No backsies zone - if we get here, the message should be valid and usable, will be processed. LL_INFOS("Avatar") << "Processing appearance message version " << thisAppearanceVersion << LL_ENDL; - if (isSelf()) - { - // Note: - // locally the COF is maintained via LLInventoryModel::accountForUpdate - // which is called from various places. This should match the simhost's - // idea of what the COF version is. AIS however maintains its own version - // of the COF that should be considered canonical. - mLastUpdateReceivedCOFVersion = thisAppearanceVersion; - } - + // Note: + // locally the COF is maintained via LLInventoryModel::accountForUpdate + // which is called from various places. This should match the simhost's + // idea of what the COF version is. AIS however maintains its own version + // of the COF that should be considered canonical. + mLastUpdateReceivedCOFVersion = thisAppearanceVersion; + if (applyParsedTEMessage(contents.mTEContents) > 0 && isChanged(TEXTURE)) { updateVisualComplexity(); -- cgit v1.3 From c4e9fe9fe5e19e6862909a0bb3c086e210871a21 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 25 Aug 2016 15:40:33 +0300 Subject: MAINT-6636 Mesh upload was failing from a folder with a diacritic character in the name --- doc/contributions.txt | 1 + indra/llprimitive/lldaeloader.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index b3d1c2432d..917fcf14f6 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -200,6 +200,7 @@ Ansariel Hiller MAINT-6511 MAINT-6612 MAINT-6637 + MAINT-6636 Aralara Rajal Arare Chantilly CHUIBUG-191 diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index 00bde8dbc3..8071d716da 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -1071,7 +1071,7 @@ bool LLDAELoader::OpenFile(const std::string& filename) std::string LLDAELoader::preprocessDAE(std::string filename) { // Open a DAE file for some preprocessing (like removing space characters in IDs), see MAINT-5678 - std::ifstream inFile; + llifstream inFile; inFile.open(filename.c_str(), std::ios_base::in); std::stringstream strStream; strStream << inFile.rdbuf(); -- cgit v1.3 From d6b0db5118788106087ec2e5743fd10110fdb470 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Fri, 26 Aug 2016 17:02:32 +0300 Subject: MAINT-6665 [Contribution] Viewer crashes when setting a local texture from a path containing non-standard characters --- doc/contributions.txt | 1 + indra/newview/lllocalbitmaps.cpp | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 917fcf14f6..05fb19aaf0 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1030,6 +1030,7 @@ Nicky Dasmijn OPEN-187 STORM-2010 STORM-2082 + MAINT-6665 Nicky Perian OPEN-1 STORM-1087 diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index aa934f95a1..a55938f334 100644 --- a/indra/newview/lllocalbitmaps.cpp +++ b/indra/newview/lllocalbitmaps.cpp @@ -181,7 +181,12 @@ bool LLLocalBitmap::updateSelf(EUpdateType optional_firstupdate) if (gDirUtilp->fileExists(mFilename)) { // verifying that the file has indeed been modified + +#ifndef LL_WINDOWS const std::time_t temp_time = boost::filesystem::last_write_time(boost::filesystem::path(mFilename)); +#else + const std::time_t temp_time = boost::filesystem::last_write_time(boost::filesystem::path(utf8str_to_utf16str(mFilename))); +#endif LLSD new_last_modified = asctime(localtime(&temp_time)); if (mLastModified.asString() != new_last_modified.asString()) -- cgit v1.3 From 741194085a70c3b6b004ad18b5bf9eb59a81b9c0 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Fri, 23 Sep 2016 00:50:16 +0300 Subject: MAINT-6752 Updated contributions.txt --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 05fb19aaf0..9f6b701000 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -201,6 +201,7 @@ Ansariel Hiller MAINT-6612 MAINT-6637 MAINT-6636 + MAINT-6752 Aralara Rajal Arare Chantilly CHUIBUG-191 -- cgit v1.3