summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenufile.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewermenufile.h')
-rw-r--r--indra/newview/llviewermenufile.h76
1 files changed, 38 insertions, 38 deletions
diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h
index 6b9df6df28..1acb701d50 100644
--- a/indra/newview/llviewermenufile.h
+++ b/indra/newview/llviewermenufile.h
@@ -1,25 +1,25 @@
-/**
+/**
* @file llviewermenufile.h
* @brief "File" menu in the main menu bar.
*
* $LicenseInfo:firstyear=2002&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$
*/
@@ -66,50 +66,50 @@ void upload_new_resource(
void assign_defaults_and_show_upload_message(
- LLAssetType::EType asset_type,
- LLInventoryType::EType& inventory_type,
- std::string& name,
- const std::string& display_name,
- std::string& description);
+ LLAssetType::EType asset_type,
+ LLInventoryType::EType& inventory_type,
+ std::string& name,
+ const std::string& display_name,
+ std::string& description);
//consider moving all file pickers below to more suitable place
class LLFilePickerThread : public LLThread
{ //multi-threaded file picker (runs system specific file picker in background and calls "notify" from main thread)
public:
- static std::queue<LLFilePickerThread*> sDeadQ;
- static LLMutex* sMutex;
+ static std::queue<LLFilePickerThread*> sDeadQ;
+ static LLMutex* sMutex;
- static void initClass();
- static void cleanupClass();
- static void clearDead();
+ static void initClass();
+ static void cleanupClass();
+ static void clearDead();
- std::vector<std::string> mResponses;
- std::string mProposedName;
+ std::vector<std::string> mResponses;
+ std::string mProposedName;
- LLFilePicker::ELoadFilter mLoadFilter;
- LLFilePicker::ESaveFilter mSaveFilter;
- bool mIsSaveDialog;
- bool mIsGetMultiple;
+ LLFilePicker::ELoadFilter mLoadFilter;
+ LLFilePicker::ESaveFilter mSaveFilter;
+ bool mIsSaveDialog;
+ bool mIsGetMultiple;
- LLFilePickerThread(LLFilePicker::ELoadFilter filter, bool get_multiple = false)
- : LLThread("file picker"), mLoadFilter(filter), mIsSaveDialog(false), mIsGetMultiple(get_multiple)
- {
- }
+ LLFilePickerThread(LLFilePicker::ELoadFilter filter, bool get_multiple = false)
+ : LLThread("file picker"), mLoadFilter(filter), mIsSaveDialog(false), mIsGetMultiple(get_multiple)
+ {
+ }
- LLFilePickerThread(LLFilePicker::ESaveFilter filter, const std::string &proposed_name)
- : LLThread("file picker"), mSaveFilter(filter), mIsSaveDialog(true), mProposedName(proposed_name)
- {
- }
+ LLFilePickerThread(LLFilePicker::ESaveFilter filter, const std::string &proposed_name)
+ : LLThread("file picker"), mSaveFilter(filter), mIsSaveDialog(true), mProposedName(proposed_name)
+ {
+ }
- void getFile();
+ void getFile();
- virtual void run();
+ virtual void run();
void runModeless();
static void modelessStringCallback(bool success, std::string &response, void *user_data);
static void modelessVectorCallback(bool success, std::vector<std::string> &responses, void *user_data);
- virtual void notify(const std::vector<std::string>& filenames) = 0;
+ virtual void notify(const std::vector<std::string>& filenames) = 0;
};
@@ -117,12 +117,12 @@ class LLFilePickerReplyThread : public LLFilePickerThread
{
public:
- typedef boost::signals2::signal<void(const std::vector<std::string>& filenames, LLFilePicker::ELoadFilter load_filter, LLFilePicker::ESaveFilter save_filter)> file_picked_signal_t;
+ typedef boost::signals2::signal<void(const std::vector<std::string>& filenames, LLFilePicker::ELoadFilter load_filter, LLFilePicker::ESaveFilter save_filter)> file_picked_signal_t;
static void startPicker(const file_picked_signal_t::slot_type& cb, LLFilePicker::ELoadFilter filter, bool get_multiple, const file_picked_signal_t::slot_type& failure_cb = file_picked_signal_t());
static void startPicker(const file_picked_signal_t::slot_type& cb, LLFilePicker::ESaveFilter filter, const std::string &proposed_name, const file_picked_signal_t::slot_type& failure_cb = file_picked_signal_t());
- virtual void notify(const std::vector<std::string>& filenames);
+ virtual void notify(const std::vector<std::string>& filenames);
private:
LLFilePickerReplyThread(const file_picked_signal_t::slot_type& cb, LLFilePicker::ELoadFilter filter, bool get_multiple, const file_picked_signal_t::slot_type& failure_cb = file_picked_signal_t());
@@ -130,10 +130,10 @@ private:
~LLFilePickerReplyThread();
private:
- LLFilePicker::ELoadFilter mLoadFilter;
- LLFilePicker::ESaveFilter mSaveFilter;
- file_picked_signal_t* mFilePickedSignal;
- file_picked_signal_t* mFailureSignal;
+ LLFilePicker::ELoadFilter mLoadFilter;
+ LLFilePicker::ESaveFilter mSaveFilter;
+ file_picked_signal_t* mFilePickedSignal;
+ file_picked_signal_t* mFailureSignal;
};
class LLMediaFilePicker : public LLFilePickerThread