From 7c89e565b373803b64cabaac3695ac3e93469962 Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Tue, 26 Oct 2010 20:02:07 -0400 Subject: This is the setting of the core file name date stamp code and settings files for Chat, Group and IM Logs. --HG-- branch : storm-102 --- doc/contributions.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 96ee446a0c..4c199672cc 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -749,6 +749,13 @@ Whoops Babii VWR-8298 Wilton Lundquist VWR-7682 +WolfPup Lowenhar + SNOW-622 + SNOW-772 + STORM-102 + STORM-103 + VWR-20741 + VWR-20933 Zai Lynch VWR-19505 Zarkonnen Decosta -- cgit v1.3 From 96112dfa2628569dea42bcf968eb7566d97e85f7 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 3 Nov 2010 13:33:29 -0400 Subject: STORM-477: fixed getNextFileInDir on Windows7, improved test cases and documentation --HG-- branch : storm-102 --- doc/contributions.txt | 1 + indra/llvfs/lldir.h | 20 ++++++---- indra/llvfs/lldir_win32.cpp | 80 +++++++++++++++++++--------------------- indra/llvfs/tests/lldir_test.cpp | 16 +++++--- 4 files changed, 62 insertions(+), 55 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 4c199672cc..18501220ac 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -409,6 +409,7 @@ McCabe Maxsted VWR-8689 VWR-9007 Michelle2 Zenovka + STORM-477 VWR-2652 VWR-2662 VWR-2834 diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h index 883e87a8fd..42996fd051 100644 --- a/indra/llvfs/lldir.h +++ b/indra/llvfs/lldir.h @@ -76,9 +76,9 @@ class LLDir virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask) = 0; /// Walk the files in a directory, with file pattern matching - virtual BOOL getNextFileInDir(const std::string &dirname, ///< directory path - must end in trailing slash! - const std::string &mask, ///< file pattern string (use "*" for all) - std::string &fname ///< found file name + virtual BOOL getNextFileInDir(const std::string& dirname, ///< directory path - must end in trailing slash! + const std::string& mask, ///< file pattern string (use "*" for all) + std::string& fname ///< output: found file name ) = 0; /**< * @returns true if a file was found, false if the entire directory has been scanned. @@ -86,12 +86,18 @@ class LLDir * @note that this function is NOT thread safe * * This function may not be used to scan part of a directory, then start a new search of a different - * directory, and then restart the first search where it left off. - * @bug: this is known to fail at least on MacOS with patterns that have both: - * a wildcard left of the . and more than one sequential ? right of the . + * directory, and then restart the first search where it left off; the entire search must run to + * completion or be abandoned - there is no restart. + * + * @bug: See http://jira.secondlife.com/browse/VWR-23697 + * and/or the tests in test/lldir_test.cpp + * This is known to fail with patterns that have both: + * a wildcard left of a . and more than one sequential ? right of a . * the pattern foo.??x appears to work * but *.??x or foo?.??x do not - * @todo this really should be rewritten as an iterator object. + * + * @todo this really should be rewritten as an iterator object, and the + * filtering should be done in a platform-independent way. */ virtual std::string getCurPath() = 0; diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp index a721552999..4a8526cc96 100644 --- a/indra/llvfs/lldir_win32.cpp +++ b/indra/llvfs/lldir_win32.cpp @@ -246,21 +246,13 @@ U32 LLDir_Win32::countFilesInDir(const std::string &dirname, const std::string & // get the next file in the directory -// automatically wrap if we've hit the end BOOL LLDir_Win32::getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname) { - llutf16string dirnamew = utf8str_to_utf16str(dirname); - return getNextFileInDir(dirnamew, mask, fname); - -} + BOOL fileFound = FALSE; + fname = ""; -BOOL LLDir_Win32::getNextFileInDir(const llutf16string &dirname, const std::string &mask, std::string &fname) -{ WIN32_FIND_DATAW FileData; - - fname = ""; - llutf16string pathname = dirname; - pathname += utf8str_to_utf16str(mask); + llutf16string pathname = utf8str_to_utf16str(dirname) + utf8str_to_utf16str(mask); if (pathname != mCurrentDir) { @@ -273,43 +265,45 @@ BOOL LLDir_Win32::getNextFileInDir(const llutf16string &dirname, const std::stri // and open new one // Check error opening Directory structure - if ((mDirSearch_h = FindFirstFile(pathname.c_str(), &FileData)) == INVALID_HANDLE_VALUE) - { -// llinfos << "Unable to locate first file" << llendl; - return(FALSE); - } - } - else // get next file in list - { - // Find next entry - if (!FindNextFile(mDirSearch_h, &FileData)) + if ((mDirSearch_h = FindFirstFile(pathname.c_str(), &FileData)) != INVALID_HANDLE_VALUE) { - if (GetLastError() == ERROR_NO_MORE_FILES) - { - // No more files, so reset to beginning of directory - FindClose(mDirSearch_h); - mCurrentDir[0] = NULL; - - fname[0] = 0; - return(FALSE); - } - else - { - // Error -// llinfos << "Unable to locate next file" << llendl; - return(FALSE); - } + fileFound = TRUE; } } - // convert from TCHAR to char - fname = utf16str_to_utf8str(FileData.cFileName); - - // fname now first name in list - return(TRUE); -} - + // Loop to skip over the current (.) and parent (..) directory entries + // (apparently returned in Win7 but not XP) + do + { + if ( fileFound + && ( (lstrcmp(FileData.cFileName, (LPCTSTR)TEXT(".")) == 0) + ||(lstrcmp(FileData.cFileName, (LPCTSTR)TEXT("..")) == 0) + ) + ) + { + fileFound = FALSE; + } + } while ( mDirSearch_h != INVALID_HANDLE_VALUE + && !fileFound + && (fileFound = FindNextFile(mDirSearch_h, &FileData) + ) + ); + + if (!fileFound && GetLastError() == ERROR_NO_MORE_FILES) + { + // No more files, so reset to beginning of directory + FindClose(mDirSearch_h); + mCurrentDir[0] = '\000'; + } + if (fileFound) + { + // convert from TCHAR to char + fname = utf16str_to_utf8str(FileData.cFileName); + } + + return fileFound; +} std::string LLDir_Win32::getCurPath() { diff --git a/indra/llvfs/tests/lldir_test.cpp b/indra/llvfs/tests/lldir_test.cpp index 30976e7661..83ccb277b3 100644 --- a/indra/llvfs/tests/lldir_test.cpp +++ b/indra/llvfs/tests/lldir_test.cpp @@ -296,12 +296,12 @@ namespace tut std::string scanResult; int found = 0; bool filesFound[5] = { false, false, false, false, false }; - std::cerr << "searching '"+directory+"' for '"+pattern+"'\n"; + //std::cerr << "searching '"+directory+"' for '"+pattern+"'\n"; while ( found <= 5 && gDirUtilp->getNextFileInDir(directory, pattern, scanResult) ) { found++; - std::cerr << " found '"+scanResult+"'\n"; + //std::cerr << " found '"+scanResult+"'\n"; int check; for (check=0; check < 5 && ! ( scanResult == DirScanFilename[check] ); check++) { @@ -377,7 +377,8 @@ namespace tut bool expected7[5] = { false, false, true, true, false }; scanTest(dir2, "file?.x?z", expected7); - // Scan dir2 and see if any file?.??c files are found - THESE FAIL AND SO ARE COMMENTED OUT FOR NOW + // Scan dir2 and see if any file?.??c files are found + // THESE FAIL ON Mac and Windows, SO ARE COMMENTED OUT FOR NOW // bool expected8[5] = { true, true, false, false, false }; // scanTest(dir2, "file?.??c", expected8); // scanTest(dir2, "*.??c", expected8); @@ -387,13 +388,18 @@ namespace tut scanTest(dir1, "*.?n?", expected9); // Scan dir1 and see if any *.???? files are found - bool expected10[5] = { false, false, false, false, false }; - scanTest(dir1, "*.????", expected10); + // THIS ONE FAILS ON WINDOWS (returns three charater suffixes) SO IS COMMENTED OUT FOR NOW + // bool expected10[5] = { false, false, false, false, false }; + // scanTest(dir1, "*.????", expected10); // Scan dir1 and see if any ?????.* files are found bool expected11[5] = { true, true, true, true, true }; scanTest(dir1, "?????.*", expected11); + // Scan dir1 and see if any ??l??.xyz files are found + bool expected12[5] = { false, false, true, true, false }; + scanTest(dir1, "??l??.xyz", expected12); + // clean up all test files and directories for (int i=0; i<5; i++) { -- cgit v1.3 From 669cf170ceae2609202fb948d388b7492f8eb90a Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Mon, 8 Nov 2010 09:31:35 -0500 Subject: STORM-102: STORM-143: Refactored the STORM-103 code to pull the proper plain test log no matter when it was generated or if it has the date stamp in the name of the log or not. --HG-- branch : storm-102 --- doc/contributions.txt | 1 + .../newview/app_settings/settings_per_account.xml | 2 +- indra/newview/lllogchat.cpp | 67 +++++++++++----------- indra/newview/lllogchat.h | 1 - 4 files changed, 34 insertions(+), 37 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 18501220ac..7343abd700 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -755,6 +755,7 @@ WolfPup Lowenhar SNOW-772 STORM-102 STORM-103 + STORM-143 VWR-20741 VWR-20933 Zai Lynch diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index ab702e49e1..705c73cbf7 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -119,7 +119,7 @@ Type Boolean Value - 1 + 0 + + + + @@ -1693,23 +1717,6 @@ - - - - - - @@ -1732,7 +1739,6 @@ function="ToggleControl" parameter="QAMode" /> - Date: Tue, 16 Nov 2010 13:33:56 -0500 Subject: STORM-535 : STORM-544 : Addition of Floater Opacity controls to pannel_prefferences_color.xml after loss during cleanup of preferences. --- doc/contributions.txt | 2 + .../default/xui/en/panel_preferences_colors.xml | 57 ++++++++++++++++++++-- 2 files changed, 54 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index 7773de47f8..eabbbe87b5 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -767,6 +767,8 @@ WolfPup Lowenhar STORM-102 STORM-103 STORM-143 + STORM-535 + STORM-544 VWR-20741 VWR-20933 Zai Lynch diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml index 036730a646..f3a5409e41 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml @@ -305,7 +305,7 @@ left="30" height="12" name="bubble_chat" - top_pad="28" + top_pad="20" width="120" > Bubble chat: @@ -336,11 +336,58 @@ height="16" increment="0.05" initial_value="1" - label="Opacity" + label="Opacity:" layout="topleft" - left_pad="15" - label_width="56" + left_pad="10" + label_width="70" name="bubble_chat_opacity" top_delta = "6" - width="347" /> + width="378" /> + + Floater Opacity: + + + -- cgit v1.3 From 7e5e9b26d5d092620998775ea1d88b11c66a121c Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Thu, 18 Nov 2010 14:09:00 -0500 Subject: Forgot to give myself credit. --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index eabbbe87b5..90b4d23fab 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -355,6 +355,7 @@ Joghert LeSabre VWR-64 Jonathan Yap VWR-17801 + STORM-616 Kage Pixel VWR-11 Ken March -- cgit v1.3 From 3eb3198248395922a1dfe277399e1a3cd235f952 Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Thu, 18 Nov 2010 18:30:00 -0500 Subject: STORM-654 : Person to Person chat logs are not created if Display Names are off Modified code in indicated changeset to correct problem after consulting with Leyla Linden who sugested the orginal change. This fix will convert the Legacy name to a user name id not useing Display Names. --- doc/contributions.txt | 1 + indra/newview/llimview.cpp | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index eabbbe87b5..b255ca98cd 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -769,6 +769,7 @@ WolfPup Lowenhar STORM-143 STORM-535 STORM-544 + STORM-654 VWR-20741 VWR-20933 Zai Lynch diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index cc48226052..3578c98622 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -537,7 +537,15 @@ bool LLIMModel::LLIMSession::isOtherParticipantAvaline() void LLIMModel::LLIMSession::onAvatarNameCache(const LLUUID& avatar_id, const LLAvatarName& av_name) { - mHistoryFileName = av_name.mUsername; + if (av_name.mUsername.empty()) + { + // display names is off, use mDisplayName which will be the legacy name + mHistoryFileName = LLCacheName::buildUsername(av_name.mDisplayName); + } + else + { + mHistoryFileName = av_name.mUsername; + } } void LLIMModel::LLIMSession::buildHistoryFileName() -- cgit v1.3 From abf406e3d5f957d66618afaf02f54d0d686bda67 Mon Sep 17 00:00:00 2001 From: Wolfpup Lowenhar Date: Tue, 23 Nov 2010 20:55:18 -0500 Subject: STORM-674: corrected duplicate name tags in pannel_preferences_color.xml --- doc/contributions.txt | 6 +++--- indra/newview/skins/default/xui/en/panel_preferences_colors.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index adfee2cce9..d4e459039d 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -768,16 +768,16 @@ WolfPup Lowenhar STORM-102 STORM-103 STORM-143 + STORM-255 + STORM-256 STORM-535 STORM-544 STORM-654 + STORM-674 VWR-20741 VWR-20933 Zai Lynch VWR-19505 -Wolfpup Lowenhar - STORM-255 - STORM-256 Zarkonnen Decosta VWR-253 Zi Ree diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml index 6dc419a96c..0c75399764 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml @@ -317,7 +317,7 @@ layout="topleft" left="30" height="12" - name="bubble_chat" + name="floater_opacity" top_pad="15" width="120" > @@ -355,7 +355,7 @@ left="50" max_val="1.00" min_val="0.00" - name="active" + name="inactive" show_text="true" top_pad="5" width="415" /> -- cgit v1.3