Backout tabs v spaces changes.

'warn-on-failure:no-tabs'

1 files changed, 237 insertions, 237 deletions

diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 0d383c1da0..da96e68f5e 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -50,308 +50,308 @@ class LLTextBox;
 typedef std::map<std::string, std::string> notifications_map;
 
 typedef enum
-    {
-        GS_LOW_GRAPHICS,
-        GS_MID_GRAPHICS,
-        GS_HIGH_GRAPHICS,
-        GS_ULTRA_GRAPHICS
-        
-    } EGraphicsSettings;
+	{
+		GS_LOW_GRAPHICS,
+		GS_MID_GRAPHICS,
+		GS_HIGH_GRAPHICS,
+		GS_ULTRA_GRAPHICS
+		
+	} EGraphicsSettings;
 
 // Floater to control preferences (display, audio, bandwidth, general.
 class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver, public LLConversationLogObserver
 {
 public: 
-    LLFloaterPreference(const LLSD& key);
-    ~LLFloaterPreference();
-
-    void apply();
-    void cancel();
-    /*virtual*/ void draw();
-    /*virtual*/ BOOL postBuild();
-    /*virtual*/ void onOpen(const LLSD& key);
-    /*virtual*/ void onClose(bool app_quitting);
-    /*virtual*/ void changed();
-    /*virtual*/ void changed(const LLUUID& session_id, U32 mask) {};
-
-    // static data update, called from message handler
-    static void updateUserInfo(const std::string& visibility, bool im_via_email, bool is_verified_email);
-
-    // refresh all the graphics preferences menus
-    static void refreshEnabledGraphics();
-    
-    // translate user's do not disturb response message according to current locale if message is default, otherwise do nothing
-    static void initDoNotDisturbResponse();
-
-    // update Show Favorites checkbox
-    static void updateShowFavoritesCheckbox(bool val);
-
-    void processProperties( void* pData, EAvatarProcessorType type );
-    void processProfileProperties(const LLAvatarData* pAvatarData );
-    void storeAvatarProperties( const LLAvatarData* pAvatarData );
-    void saveAvatarProperties( void );
-    void selectPrivacyPanel();
-    void selectChatPanel();
-    void getControlNames(std::vector<std::string>& names);
-
-protected:  
-    void        onBtnOK(const LLSD& userdata);
-    void        onBtnCancel(const LLSD& userdata);
-
-    void        onClickClearCache();            // Clear viewer texture cache, vfs, and VO cache on next startup
-    void        onClickBrowserClearCache();     // Clear web history and caches as well as viewer caches above
-    void        onLanguageChange();
-    void        onNotificationsChange(const std::string& OptionName);
-    void        onNameTagOpacityChange(const LLSD& newvalue);
-
-    // set value of "DoNotDisturbResponseChanged" in account settings depending on whether do not disturb response
-    // string differs from default after user changes.
-    void onDoNotDisturbResponseChanged();
-    // if the custom settings box is clicked
-    void onChangeCustom();
-    void updateMeterText(LLUICtrl* ctrl);
-    // callback for defaults
-    void setHardwareDefaults();
-    void setRecommended();
-    // callback for when client turns on shaders
-    void onVertexShaderEnable();
-    // callback for when client turns on impostors
-    void onAvatarImpostorsEnable();
-
-    // callback for commit in the "Single click on land" and "Double click on land" comboboxes.
-    void onClickActionChange();
-    // updates click/double-click action settings depending on controls values
-    void updateClickActionSettings();
-    // updates click/double-click action controls depending on values from settings.xml
-    void updateClickActionControls();
+	LLFloaterPreference(const LLSD& key);
+	~LLFloaterPreference();
+
+	void apply();
+	void cancel();
+	/*virtual*/ void draw();
+	/*virtual*/ BOOL postBuild();
+	/*virtual*/ void onOpen(const LLSD& key);
+	/*virtual*/	void onClose(bool app_quitting);
+	/*virtual*/ void changed();
+	/*virtual*/ void changed(const LLUUID& session_id, U32 mask) {};
+
+	// static data update, called from message handler
+	static void updateUserInfo(const std::string& visibility, bool im_via_email, bool is_verified_email);
+
+	// refresh all the graphics preferences menus
+	static void refreshEnabledGraphics();
+	
+	// translate user's do not disturb response message according to current locale if message is default, otherwise do nothing
+	static void initDoNotDisturbResponse();
+
+	// update Show Favorites checkbox
+	static void updateShowFavoritesCheckbox(bool val);
+
+	void processProperties( void* pData, EAvatarProcessorType type );
+	void processProfileProperties(const LLAvatarData* pAvatarData );
+	void storeAvatarProperties( const LLAvatarData* pAvatarData );
+	void saveAvatarProperties( void );
+	void selectPrivacyPanel();
+	void selectChatPanel();
+	void getControlNames(std::vector<std::string>& names);
+
+protected:	
+	void		onBtnOK(const LLSD& userdata);
+	void		onBtnCancel(const LLSD& userdata);
+
+	void		onClickClearCache();			// Clear viewer texture cache, vfs, and VO cache on next startup
+	void		onClickBrowserClearCache();		// Clear web history and caches as well as viewer caches above
+	void		onLanguageChange();
+	void		onNotificationsChange(const std::string& OptionName);
+	void		onNameTagOpacityChange(const LLSD& newvalue);
+
+	// set value of "DoNotDisturbResponseChanged" in account settings depending on whether do not disturb response
+	// string differs from default after user changes.
+	void onDoNotDisturbResponseChanged();
+	// if the custom settings box is clicked
+	void onChangeCustom();
+	void updateMeterText(LLUICtrl* ctrl);
+	// callback for defaults
+	void setHardwareDefaults();
+	void setRecommended();
+	// callback for when client turns on shaders
+	void onVertexShaderEnable();
+	// callback for when client turns on impostors
+	void onAvatarImpostorsEnable();
+
+	// callback for commit in the "Single click on land" and "Double click on land" comboboxes.
+	void onClickActionChange();
+	// updates click/double-click action settings depending on controls values
+	void updateClickActionSettings();
+	// updates click/double-click action controls depending on values from settings.xml
+	void updateClickActionControls();
 
 public:
-    // This function squirrels away the current values of the controls so that
-    // cancel() can restore them.   
-    void saveSettings();
-
-    void setCacheLocation(const LLStringExplicit& location);
-
-    void onClickSetCache();
-    void changeCachePath(const std::vector<std::string>& filenames, std::string proposed_name);
-    void onClickResetCache();
-    void onClickSkin(LLUICtrl* ctrl,const LLSD& userdata);
-    void onSelectSkin();
-    void onClickSetKey();
-    void setKey(KEY key);
-    void onClickSetMiddleMouse();
-    void onClickSetSounds();
-    void onClickEnablePopup();
-    void onClickDisablePopup(); 
-    void resetAllIgnored();
-    void setAllIgnored();
-    void onClickLogPath();
-    void changeLogPath(const std::vector<std::string>& filenames, std::string proposed_name);
-    bool moveTranscriptsAndLog();
-    void enableHistory();
-    void setPersonalInfo(const std::string& visibility, bool im_via_email, bool is_verified_email);
-    void refreshEnabledState();
-    void onCommitWindowedMode();
-    void refresh(); // Refresh enable/disable
-    // if the quality radio buttons are changed
-    void onChangeQuality(const LLSD& data);
-    
-    void refreshUI();
-
-    void onCommitParcelMediaAutoPlayEnable();
-    void onCommitMediaEnabled();
-    void onCommitMusicEnabled();
-    void applyResolution();
-    void onChangeMaturity();
-    void onChangeModelFolder();
-    void onChangeTextureFolder();
-    void onChangeSoundFolder();
-    void onChangeAnimationFolder();
-    void onClickBlockList();
-    void onClickProxySettings();
-    void onClickTranslationSettings();
-    void onClickPermsDefault();
-    void onClickAutoReplace();
-    void onClickSpellChecker();
-    void onClickRenderExceptions();
-    void onClickAdvanced();
-    void applyUIColor(LLUICtrl* ctrl, const LLSD& param);
-    void getUIColor(LLUICtrl* ctrl, const LLSD& param);
-    void onLogChatHistorySaved();   
-    void buildPopupLists();
-    static void refreshSkin(void* data);
-    void selectPanel(const LLSD& name);
-    void saveCameraPreset(std::string& preset);
-    void saveGraphicsPreset(std::string& preset);
+	// This function squirrels away the current values of the controls so that
+	// cancel() can restore them.	
+	void saveSettings();
+
+	void setCacheLocation(const LLStringExplicit& location);
+
+	void onClickSetCache();
+	void changeCachePath(const std::vector<std::string>& filenames, std::string proposed_name);
+	void onClickResetCache();
+	void onClickSkin(LLUICtrl* ctrl,const LLSD& userdata);
+	void onSelectSkin();
+	void onClickSetKey();
+	void setKey(KEY key);
+	void onClickSetMiddleMouse();
+	void onClickSetSounds();
+	void onClickEnablePopup();
+	void onClickDisablePopup();	
+	void resetAllIgnored();
+	void setAllIgnored();
+	void onClickLogPath();
+	void changeLogPath(const std::vector<std::string>& filenames, std::string proposed_name);
+	bool moveTranscriptsAndLog();
+	void enableHistory();
+	void setPersonalInfo(const std::string& visibility, bool im_via_email, bool is_verified_email);
+	void refreshEnabledState();
+	void onCommitWindowedMode();
+	void refresh();	// Refresh enable/disable
+	// if the quality radio buttons are changed
+	void onChangeQuality(const LLSD& data);
+	
+	void refreshUI();
+
+	void onCommitParcelMediaAutoPlayEnable();
+	void onCommitMediaEnabled();
+	void onCommitMusicEnabled();
+	void applyResolution();
+	void onChangeMaturity();
+	void onChangeModelFolder();
+	void onChangeTextureFolder();
+	void onChangeSoundFolder();
+	void onChangeAnimationFolder();
+	void onClickBlockList();
+	void onClickProxySettings();
+	void onClickTranslationSettings();
+	void onClickPermsDefault();
+	void onClickAutoReplace();
+	void onClickSpellChecker();
+	void onClickRenderExceptions();
+	void onClickAdvanced();
+	void applyUIColor(LLUICtrl* ctrl, const LLSD& param);
+	void getUIColor(LLUICtrl* ctrl, const LLSD& param);
+	void onLogChatHistorySaved();	
+	void buildPopupLists();
+	static void refreshSkin(void* data);
+	void selectPanel(const LLSD& name);
+	void saveCameraPreset(std::string& preset);
+	void saveGraphicsPreset(std::string& preset);
 
 private:
 
-    void onDeleteTranscripts();
-    void onDeleteTranscriptsResponse(const LLSD& notification, const LLSD& response);
-    void updateDeleteTranscriptsButton();
-    void updateMaxComplexity();
-
-    static std::string sSkin;
-    notifications_map mNotificationOptions;
-    bool mClickActionDirty; ///< Set to true when the click/double-click options get changed by user.
-    bool mGotPersonalInfo;
-    bool mOriginalIMViaEmail;
-    bool mLanguageChanged;
-    bool mAvatarDataInitialized;
-    std::string mPriorInstantMessageLogPath;
-    
-    bool mOriginalHideOnlineStatus;
-    std::string mDirectoryVisibility;
-    
-    LLAvatarData mAvatarProperties;
-    std::string mSavedCameraPreset;
-    std::string mSavedGraphicsPreset;
-    LOG_CLASS(LLFloaterPreference);
+	void onDeleteTranscripts();
+	void onDeleteTranscriptsResponse(const LLSD& notification, const LLSD& response);
+	void updateDeleteTranscriptsButton();
+	void updateMaxComplexity();
+
+	static std::string sSkin;
+	notifications_map mNotificationOptions;
+	bool mClickActionDirty; ///< Set to true when the click/double-click options get changed by user.
+	bool mGotPersonalInfo;
+	bool mOriginalIMViaEmail;
+	bool mLanguageChanged;
+	bool mAvatarDataInitialized;
+	std::string mPriorInstantMessageLogPath;
+	
+	bool mOriginalHideOnlineStatus;
+	std::string mDirectoryVisibility;
+	
+	LLAvatarData mAvatarProperties;
+	std::string mSavedCameraPreset;
+	std::string mSavedGraphicsPreset;
+	LOG_CLASS(LLFloaterPreference);
 };
 
 class LLPanelPreference : public LLPanel
 {
 public:
-    LLPanelPreference();
-    /*virtual*/ BOOL postBuild();
-    
-    virtual ~LLPanelPreference();
+	LLPanelPreference();
+	/*virtual*/ BOOL postBuild();
+	
+	virtual ~LLPanelPreference();
 
-    virtual void apply();
-    virtual void cancel();
-    void setControlFalse(const LLSD& user_data);
-    virtual void setHardwareDefaults();
+	virtual void apply();
+	virtual void cancel();
+	void setControlFalse(const LLSD& user_data);
+	virtual void setHardwareDefaults();
 
-    // Disables "Allow Media to auto play" check box only when both
-    // "Streaming Music" and "Media" are unchecked. Otherwise enables it.
-    void updateMediaAutoPlayCheckbox(LLUICtrl* ctrl);
+	// Disables "Allow Media to auto play" check box only when both
+	// "Streaming Music" and "Media" are unchecked. Otherwise enables it.
+	void updateMediaAutoPlayCheckbox(LLUICtrl* ctrl);
 
-    // This function squirrels away the current values of the controls so that
-    // cancel() can restore them.
-    virtual void saveSettings();
+	// This function squirrels away the current values of the controls so that
+	// cancel() can restore them.
+	virtual void saveSettings();
 
-    void deletePreset(const LLSD& user_data);
-    void savePreset(const LLSD& user_data);
-    void loadPreset(const LLSD& user_data);
+	void deletePreset(const LLSD& user_data);
+	void savePreset(const LLSD& user_data);
+	void loadPreset(const LLSD& user_data);
 
-    class Updater;
+	class Updater;
 
 protected:
-    typedef std::map<LLControlVariable*, LLSD> control_values_map_t;
-    control_values_map_t mSavedValues;
+	typedef std::map<LLControlVariable*, LLSD> control_values_map_t;
+	control_values_map_t mSavedValues;
 
 private:
-    //for "Only friends and groups can call or IM me"
-    static void showFriendsOnlyWarning(LLUICtrl*, const LLSD&);
+	//for "Only friends and groups can call or IM me"
+	static void showFriendsOnlyWarning(LLUICtrl*, const LLSD&);
     //for  "Allow Multiple Viewers"
     static void showMultipleViewersWarning(LLUICtrl*, const LLSD&);
-    //for "Show my Favorite Landmarks at Login"
-    static void handleFavoritesOnLoginChanged(LLUICtrl* checkbox, const LLSD& value);
+	//for "Show my Favorite Landmarks at Login"
+	static void handleFavoritesOnLoginChanged(LLUICtrl* checkbox, const LLSD& value);
 
-    static void toggleMuteWhenMinimized();
-    typedef std::map<std::string, LLColor4> string_color_map_t;
-    string_color_map_t mSavedColors;
+	static void toggleMuteWhenMinimized();
+	typedef std::map<std::string, LLColor4> string_color_map_t;
+	string_color_map_t mSavedColors;
 
-    Updater* mBandWidthUpdater;
-    LOG_CLASS(LLPanelPreference);
+	Updater* mBandWidthUpdater;
+	LOG_CLASS(LLPanelPreference);
 };
 
 class LLPanelPreferenceView : public LLPanelPreference
 {
 public:
-    BOOL postBuild();
-    void draw();
-    void setPresetText();
+	BOOL postBuild();
+	void draw();
+	void setPresetText();
 
 private:
-    void onPresetsListChangeCamera();
-    LOG_CLASS(LLPanelPreferenceView);
+	void onPresetsListChangeCamera();
+	LOG_CLASS(LLPanelPreferenceView);
 };
 
 class LLPanelPreferenceGraphics : public LLPanelPreference
 {
 public:
-    BOOL postBuild();
-    void draw();
-    void cancel();
-    void saveSettings();
-    void resetDirtyChilds();
-    void setHardwareDefaults();
-    void setPresetText();
+	BOOL postBuild();
+	void draw();
+	void cancel();
+	void saveSettings();
+	void resetDirtyChilds();
+	void setHardwareDefaults();
+	void setPresetText();
 
-    static const std::string getPresetsPath();
+	static const std::string getPresetsPath();
 
 protected:
-    bool hasDirtyChilds();
+	bool hasDirtyChilds();
 
 private:
-    void onPresetsListChange();
-    LOG_CLASS(LLPanelPreferenceGraphics);
+	void onPresetsListChange();
+	LOG_CLASS(LLPanelPreferenceGraphics);
 };
 
 class LLFloaterPreferenceGraphicsAdvanced : public LLFloater
 {
   public: 
-    LLFloaterPreferenceGraphicsAdvanced(const LLSD& key);
-    ~LLFloaterPreferenceGraphicsAdvanced();
-    /*virtual*/ BOOL postBuild();
-    void onOpen(const LLSD& key);
-    void onClickCloseBtn(bool app_quitting);
-    void disableUnavailableSettings();
-    void refreshEnabledGraphics();
-    void refreshEnabledState();
-    void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box);
-    void updateMaxNonImpostors();
-    void setMaxNonImpostorsText(U32 value, LLTextBox* text_box);
-    void updateMaxComplexity();
-    void setMaxComplexityText(U32 value, LLTextBox* text_box);
-    static void setIndirectControls();
-    static void setIndirectMaxNonImpostors();
-    static void setIndirectMaxArc();
-    void refresh();
-    // callback for when client turns on shaders
-    void onVertexShaderEnable();
-    LOG_CLASS(LLFloaterPreferenceGraphicsAdvanced);
+	LLFloaterPreferenceGraphicsAdvanced(const LLSD& key);
+	~LLFloaterPreferenceGraphicsAdvanced();
+	/*virtual*/ BOOL postBuild();
+	void onOpen(const LLSD& key);
+	void onClickCloseBtn(bool app_quitting);
+	void disableUnavailableSettings();
+	void refreshEnabledGraphics();
+	void refreshEnabledState();
+	void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box);
+	void updateMaxNonImpostors();
+	void setMaxNonImpostorsText(U32 value, LLTextBox* text_box);
+	void updateMaxComplexity();
+	void setMaxComplexityText(U32 value, LLTextBox* text_box);
+	static void setIndirectControls();
+	static void setIndirectMaxNonImpostors();
+	static void setIndirectMaxArc();
+	void refresh();
+	// callback for when client turns on shaders
+	void onVertexShaderEnable();
+	LOG_CLASS(LLFloaterPreferenceGraphicsAdvanced);
 };
 
 class LLAvatarComplexityControls
 {
   public: 
-    static void updateMax(LLSliderCtrl* slider, LLTextBox* value_label);
-    static void setText(U32 value, LLTextBox* text_box);
-    static void setIndirectControls();
-    static void setIndirectMaxNonImpostors();
-    static void setIndirectMaxArc();
-    LOG_CLASS(LLAvatarComplexityControls);
+	static void updateMax(LLSliderCtrl* slider, LLTextBox* value_label);
+	static void setText(U32 value, LLTextBox* text_box);
+	static void setIndirectControls();
+	static void setIndirectMaxNonImpostors();
+	static void setIndirectMaxArc();
+	LOG_CLASS(LLAvatarComplexityControls);
 };
 
 class LLFloaterPreferenceProxy : public LLFloater
 {
 public: 
-    LLFloaterPreferenceProxy(const LLSD& key);
-    ~LLFloaterPreferenceProxy();
+	LLFloaterPreferenceProxy(const LLSD& key);
+	~LLFloaterPreferenceProxy();
 
-    /// show off our menu
-    static void show();
-    void cancel();
-    
+	/// show off our menu
+	static void show();
+	void cancel();
+	
 protected:
-    BOOL postBuild();
-    void onOpen(const LLSD& key);
-    void onClose(bool app_quitting);
-    void saveSettings();
-    void onBtnOk();
-    void onBtnCancel();
-    void onClickCloseBtn(bool app_quitting = false);
+	BOOL postBuild();
+	void onOpen(const LLSD& key);
+	void onClose(bool app_quitting);
+	void saveSettings();
+	void onBtnOk();
+	void onBtnCancel();
+	void onClickCloseBtn(bool app_quitting = false);
 
-    void onChangeSocksSettings();
+	void onChangeSocksSettings();
 
 private:
-    
-    bool mSocksSettingsDirty;
-    typedef std::map<LLControlVariable*, LLSD> control_values_map_t;
-    control_values_map_t mSavedValues;
-    LOG_CLASS(LLFloaterPreferenceProxy);
+	
+	bool mSocksSettingsDirty;
+	typedef std::map<LLControlVariable*, LLSD> control_values_map_t;
+	control_values_map_t mSavedValues;
+	LOG_CLASS(LLFloaterPreferenceProxy);
 };