From d0e82ca55670645eacc61fca39bf8667c0840de9 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 16 Feb 2024 00:02:04 +0200 Subject: jira-archive-internal#67837 Windows' bulk export of snapshots and textures SL-17661 Viewer was silently failing to 'save selection as' --- indra/newview/lldirpicker.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'indra/newview/lldirpicker.h') diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h index 52febe4523..bdf7b4ddba 100644 --- a/indra/newview/lldirpicker.h +++ b/indra/newview/lldirpicker.h @@ -57,9 +57,6 @@ class LLFilePicker; class LLDirPicker { public: - // calling this before main() is undefined - static LLDirPicker& instance( void ) { return sInstance; } - BOOL getDir(std::string* filename, bool blocking = true); std::string getDirName(); @@ -87,12 +84,9 @@ private: std::string* mFileName; std::string mDir; bool mLocked; + void *pDialog; + boost::signals2::connection mEventListener; - static LLDirPicker sInstance; -#if LL_WINDOWS - BROWSEINFO bi; -#endif - public: // don't call these directly please. LLDirPicker(); -- cgit v1.2.3 From 60d3dd98a44230c21803c1606552ee098ed9fa7c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Feb 2024 21:05:14 +0100 Subject: Convert remaining BOOL to bool --- indra/newview/lldirpicker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lldirpicker.h') diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h index bdf7b4ddba..12655229b3 100644 --- a/indra/newview/lldirpicker.h +++ b/indra/newview/lldirpicker.h @@ -57,7 +57,7 @@ class LLFilePicker; class LLDirPicker { public: - BOOL getDir(std::string* filename, bool blocking = true); + bool getDir(std::string* filename, bool blocking = true); std::string getDirName(); // clear any lists of buffers or whatever, and make sure the dir -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/lldirpicker.h | 250 ++++++++++++++++++++++---------------------- 1 file changed, 125 insertions(+), 125 deletions(-) (limited to 'indra/newview/lldirpicker.h') diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h index eb8e91a4a5..dc740caab2 100644 --- a/indra/newview/lldirpicker.h +++ b/indra/newview/lldirpicker.h @@ -1,125 +1,125 @@ -/** - * @dir lldirpicker.h - * @brief OS-specific dir picker - * - * $LicenseInfo:firstyear=2001&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -// OS specific dir selection dialog. This is implemented as a -// singleton class, so call the instance() method to get the working -// instance. - -#ifndef LL_LLDIRPICKER_H -#define LL_LLDIRPICKER_H - -#include "stdtypes.h" - -#include "llthread.h" -#include - -#if LL_WINDOWS -#include -#endif - -#if LL_DARWIN - -// AssertMacros.h does bad things. -#undef verify -#undef check -#undef require - -#include -#include "llstring.h" - -#endif - -class LLFilePicker; - -class LLDirPicker -{ -public: - bool getDir(std::string* filename, bool blocking = true); - std::string getDirName(); - - // clear any lists of buffers or whatever, and make sure the dir - // picker isn't locked. - void reset(); - -private: - enum - { - SINGLE_DIRNAME_BUFFER_SIZE = 1024, - //DIRNAME_BUFFER_SIZE = 65536 - DIRNAME_BUFFER_SIZE = 65000 - }; - - void buildDirname( void ); - bool check_local_file_access_enabled(); - -#if LL_LINUX || LL_DARWIN - // On Linux we just implement LLDirPicker on top of LLFilePicker - LLFilePicker *mFilePicker; -#endif - - - std::string* mFileName; - std::string mDir; - bool mLocked; - void *pDialog; - boost::signals2::connection mEventListener; - -public: - // don't call these directly please. - LLDirPicker(); - ~LLDirPicker(); -}; - -class LLDirPickerThread : public LLThread -{ -public: - - static std::queue sDeadQ; - static LLMutex* sMutex; - - static void initClass(); - static void cleanupClass(); - static void clearDead(); - - std::vector mResponses; - std::string mProposedName; - - typedef boost::signals2::signal& filenames, std::string proposed_name)> dir_picked_signal_t; - - LLDirPickerThread(const dir_picked_signal_t::slot_type& cb, const std::string &proposed_name); - ~LLDirPickerThread(); - - void getFile(); - - virtual void run(); - - virtual void notify(const std::vector& filenames); - -private: - dir_picked_signal_t* mFilePickedSignal; -}; - -#endif +/** + * @dir lldirpicker.h + * @brief OS-specific dir picker + * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +// OS specific dir selection dialog. This is implemented as a +// singleton class, so call the instance() method to get the working +// instance. + +#ifndef LL_LLDIRPICKER_H +#define LL_LLDIRPICKER_H + +#include "stdtypes.h" + +#include "llthread.h" +#include + +#if LL_WINDOWS +#include +#endif + +#if LL_DARWIN + +// AssertMacros.h does bad things. +#undef verify +#undef check +#undef require + +#include +#include "llstring.h" + +#endif + +class LLFilePicker; + +class LLDirPicker +{ +public: + bool getDir(std::string* filename, bool blocking = true); + std::string getDirName(); + + // clear any lists of buffers or whatever, and make sure the dir + // picker isn't locked. + void reset(); + +private: + enum + { + SINGLE_DIRNAME_BUFFER_SIZE = 1024, + //DIRNAME_BUFFER_SIZE = 65536 + DIRNAME_BUFFER_SIZE = 65000 + }; + + void buildDirname( void ); + bool check_local_file_access_enabled(); + +#if LL_LINUX || LL_DARWIN + // On Linux we just implement LLDirPicker on top of LLFilePicker + LLFilePicker *mFilePicker; +#endif + + + std::string* mFileName; + std::string mDir; + bool mLocked; + void *pDialog; + boost::signals2::connection mEventListener; + +public: + // don't call these directly please. + LLDirPicker(); + ~LLDirPicker(); +}; + +class LLDirPickerThread : public LLThread +{ +public: + + static std::queue sDeadQ; + static LLMutex* sMutex; + + static void initClass(); + static void cleanupClass(); + static void clearDead(); + + std::vector mResponses; + std::string mProposedName; + + typedef boost::signals2::signal& filenames, std::string proposed_name)> dir_picked_signal_t; + + LLDirPickerThread(const dir_picked_signal_t::slot_type& cb, const std::string &proposed_name); + ~LLDirPickerThread(); + + void getFile(); + + virtual void run(); + + virtual void notify(const std::vector& filenames); + +private: + dir_picked_signal_t* mFilePickedSignal; +}; + +#endif -- cgit v1.2.3