Fix line endlings

1 files changed, 108 insertions, 108 deletions

diff --git a/indra/newview/llviewerwearable.h b/indra/newview/llviewerwearable.h
index 1eb2626a74..233c65aefb 100644
--- a/indra/newview/llviewerwearable.h
+++ b/indra/newview/llviewerwearable.h
@@ -1,108 +1,108 @@
-/**

- * @file llviewerwearable.h

- * @brief LLViewerWearable class header file

- *

- * $LicenseInfo:firstyear=2012&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$

- */

-

-#ifndef LL_VIEWER_WEARABLE_H

-#define LL_VIEWER_WEARABLE_H

-

-#include "llwearable.h"

-#include "llavatarappearancedefines.h"

-#include "llextendedstatus.h"

-

-class LLVOAvatar;

-

-class LLViewerWearable : public LLWearable

-{

-    friend class LLWearableList;

-

-    //--------------------------------------------------------------------

-    // Constructors and destructors

-    //--------------------------------------------------------------------

-private:

-    // Private constructors used by LLViewerWearableList

-    LLViewerWearable(const LLTransactionID& transactionID);

-    LLViewerWearable(const LLAssetID& assetID);

-public:

-    virtual ~LLViewerWearable();

-

-    //--------------------------------------------------------------------

-    // Accessors

-    //--------------------------------------------------------------------

-public:

-    const LLUUID&               getItemID() const { return mItemID; }

-    const LLAssetID&            getAssetID() const { return mAssetID; }

-    const LLTransactionID&      getTransactionID() const { return mTransactionID; }

-    void                        setItemID(const LLUUID& item_id);

-

-public:

-

-    bool                isDirty() const;

-    bool                isOldVersion() const;

-

-    /*virtual*/ void    writeToAvatar(LLAvatarAppearance *avatarp);

-    void                removeFromAvatar()  { LLViewerWearable::removeFromAvatar( mType); }

-    static void         removeFromAvatar( LLWearableType::EType type);

-

-    /*virtual*/ EImportResult   importStream( std::istream& input_stream, LLAvatarAppearance* avatarp );

-

-    void                setParamsToDefaults();

-    void                setTexturesToDefaults();

-    void                setVolatile(bool is_volatile) { mVolatile = is_volatile; } // true when doing preview renders, some updates will be suppressed.

-    bool                getVolatile() { return mVolatile; }

-

-    /*virtual*/ LLUUID  getDefaultTextureImageID(LLAvatarAppearanceDefines::ETextureIndex index) const;

-

-

-    void                saveNewAsset() const;

-    static void         onSaveNewAssetComplete( const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status );

-

-    void                copyDataFrom(const LLViewerWearable* src);

-

-    friend std::ostream& operator<<(std::ostream &s, const LLViewerWearable &w);

-

-    /*virtual*/ void    revertValues();

-    /*virtual*/ void    saveValues();

-

-    void                revertValuesWithoutUpdate();

-

-    // Something happened that requires the wearable's label to be updated (e.g. worn/unworn).

-    /*virtual*/void     setUpdated() const;

-

-    // the wearable was worn. make sure the name of the wearable object matches the LLViewerInventoryItem,

-    // not the wearable asset itself.

-    void                refreshName();

-

-protected:

-    LLAssetID           mAssetID;

-    LLTransactionID     mTransactionID;

-

-    bool                mVolatile; // True when rendering preview images. Can suppress some updates.

-

-    LLUUID              mItemID;  // ID of the inventory item in the agent's inventory

-};

-

-

-#endif  // LL_VIEWER_WEARABLE_H

-

+/**
+ * @file llviewerwearable.h
+ * @brief LLViewerWearable class header file
+ *
+ * $LicenseInfo:firstyear=2012&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$
+ */
+
+#ifndef LL_VIEWER_WEARABLE_H
+#define LL_VIEWER_WEARABLE_H
+
+#include "llwearable.h"
+#include "llavatarappearancedefines.h"
+#include "llextendedstatus.h"
+
+class LLVOAvatar;
+
+class LLViewerWearable : public LLWearable
+{
+    friend class LLWearableList;
+
+    //--------------------------------------------------------------------
+    // Constructors and destructors
+    //--------------------------------------------------------------------
+private:
+    // Private constructors used by LLViewerWearableList
+    LLViewerWearable(const LLTransactionID& transactionID);
+    LLViewerWearable(const LLAssetID& assetID);
+public:
+    virtual ~LLViewerWearable();
+
+    //--------------------------------------------------------------------
+    // Accessors
+    //--------------------------------------------------------------------
+public:
+    const LLUUID&               getItemID() const { return mItemID; }
+    const LLAssetID&            getAssetID() const { return mAssetID; }
+    const LLTransactionID&      getTransactionID() const { return mTransactionID; }
+    void                        setItemID(const LLUUID& item_id);
+
+public:
+
+    bool                isDirty() const;
+    bool                isOldVersion() const;
+
+    /*virtual*/ void    writeToAvatar(LLAvatarAppearance *avatarp);
+    void                removeFromAvatar()  { LLViewerWearable::removeFromAvatar( mType); }
+    static void         removeFromAvatar( LLWearableType::EType type);
+
+    /*virtual*/ EImportResult   importStream( std::istream& input_stream, LLAvatarAppearance* avatarp );
+
+    void                setParamsToDefaults();
+    void                setTexturesToDefaults();
+    void                setVolatile(bool is_volatile) { mVolatile = is_volatile; } // true when doing preview renders, some updates will be suppressed.
+    bool                getVolatile() { return mVolatile; }
+
+    /*virtual*/ LLUUID  getDefaultTextureImageID(LLAvatarAppearanceDefines::ETextureIndex index) const;
+
+
+    void                saveNewAsset() const;
+    static void         onSaveNewAssetComplete( const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status );
+
+    void                copyDataFrom(const LLViewerWearable* src);
+
+    friend std::ostream& operator<<(std::ostream &s, const LLViewerWearable &w);
+
+    /*virtual*/ void    revertValues();
+    /*virtual*/ void    saveValues();
+
+    void                revertValuesWithoutUpdate();
+
+    // Something happened that requires the wearable's label to be updated (e.g. worn/unworn).
+    /*virtual*/void     setUpdated() const;
+
+    // the wearable was worn. make sure the name of the wearable object matches the LLViewerInventoryItem,
+    // not the wearable asset itself.
+    void                refreshName();
+
+protected:
+    LLAssetID           mAssetID;
+    LLTransactionID     mTransactionID;
+
+    bool                mVolatile; // True when rendering preview images. Can suppress some updates.
+
+    LLUUID              mItemID;  // ID of the inventory item in the agent's inventory
+};
+
+
+#endif  // LL_VIEWER_WEARABLE_H
+