Fix line endlings

1 files changed, 119 insertions, 119 deletions

diff --git a/indra/newview/lllocalgltfmaterials.h b/indra/newview/lllocalgltfmaterials.h
index c638454014..b806b54508 100644
--- a/indra/newview/lllocalgltfmaterials.h
+++ b/indra/newview/lllocalgltfmaterials.h
@@ -1,119 +1,119 @@
-/**

- * @file lllocalrendermaterials.h

- * @brief Local GLTF materials header

- *

- * $LicenseInfo:firstyear=2022&license=viewerlgpl$

- * Second Life Viewer Source Code

- * Copyright (C) 2022, 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_LOCALGLTFMATERIALS_H

-#define LL_LOCALGLTFMATERIALS_H

-

-#include "lleventtimer.h"

-#include "llpointer.h"

-#include "llgltfmateriallist.h"

-

-class LLScrollListCtrl;

-class LLGLTFMaterial;

-class LLViewerObject;

-class LLTextureEntry;

-

-class LLLocalGLTFMaterial : public LLFetchedGLTFMaterial

-{

-public: /* main */

-    LLLocalGLTFMaterial(std::string filename, S32 index);

-    virtual ~LLLocalGLTFMaterial();

-

-public: /* accessors */

-    std::string getFilename() const;

-    std::string getShortName() const;

-    LLUUID      getTrackingID() const;

-    LLUUID      getWorldID() const;

-    S32         getIndexInFile() const;

-

-public:

-    bool updateSelf();

-

-private:

-    bool loadMaterial();

-

-private: /* private enums */

-    enum ELinkStatus

-    {

-        LS_ON,

-        LS_BROKEN,

-    };

-

-    enum EExtension

-    {

-        ET_MATERIAL_GLTF,

-        ET_MATERIAL_GLB,

-    };

-

-private: /* members */

-    std::string mFilename;

-    std::string mShortName;

-    LLUUID      mTrackingID;

-    LLUUID      mWorldID;

-    LLSD        mLastModified;

-    EExtension  mExtension;

-    ELinkStatus mLinkStatus;

-    S32         mUpdateRetries;

-    S32         mMaterialIndex; // Single file can have more than one

-};

-

-class LLLocalGLTFMaterialTimer : public LLEventTimer

-{

-public:

-    LLLocalGLTFMaterialTimer();

-    ~LLLocalGLTFMaterialTimer();

-

-public:

-    void startTimer();

-    void stopTimer();

-    bool isRunning();

-    bool tick();

-};

-

-class LLLocalGLTFMaterialMgr : public LLSingleton<LLLocalGLTFMaterialMgr>

-{

-    LLSINGLETON(LLLocalGLTFMaterialMgr);

-    ~LLLocalGLTFMaterialMgr();

-public:

-    S32          addUnit(const std::vector<std::string>& filenames);

-    S32          addUnit(const std::string& filename); // file can hold multiple materials

-    void         delUnit(LLUUID tracking_id);

-

-    LLUUID       getWorldID(LLUUID tracking_id);

-    bool         isLocal(LLUUID world_id);

-    void         getFilenameAndIndex(LLUUID tracking_id, std::string &filename, S32 &index);

-

-    void         feedScrollList(LLScrollListCtrl* ctrl);

-    void         doUpdates();

-

-private:

-    std::list<LLPointer<LLLocalGLTFMaterial> >    mMaterialList;

-    LLLocalGLTFMaterialTimer           mTimer;

-    typedef std::list<LLPointer<LLLocalGLTFMaterial> >::iterator local_list_iter;

-};

-

-#endif // LL_LOCALGLTFMATERIALS_H

-

+/**
+ * @file lllocalrendermaterials.h
+ * @brief Local GLTF materials header
+ *
+ * $LicenseInfo:firstyear=2022&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2022, 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_LOCALGLTFMATERIALS_H
+#define LL_LOCALGLTFMATERIALS_H
+
+#include "lleventtimer.h"
+#include "llpointer.h"
+#include "llgltfmateriallist.h"
+
+class LLScrollListCtrl;
+class LLGLTFMaterial;
+class LLViewerObject;
+class LLTextureEntry;
+
+class LLLocalGLTFMaterial : public LLFetchedGLTFMaterial
+{
+public: /* main */
+    LLLocalGLTFMaterial(std::string filename, S32 index);
+    virtual ~LLLocalGLTFMaterial();
+
+public: /* accessors */
+    std::string getFilename() const;
+    std::string getShortName() const;
+    LLUUID      getTrackingID() const;
+    LLUUID      getWorldID() const;
+    S32         getIndexInFile() const;
+
+public:
+    bool updateSelf();
+
+private:
+    bool loadMaterial();
+
+private: /* private enums */
+    enum ELinkStatus
+    {
+        LS_ON,
+        LS_BROKEN,
+    };
+
+    enum EExtension
+    {
+        ET_MATERIAL_GLTF,
+        ET_MATERIAL_GLB,
+    };
+
+private: /* members */
+    std::string mFilename;
+    std::string mShortName;
+    LLUUID      mTrackingID;
+    LLUUID      mWorldID;
+    LLSD        mLastModified;
+    EExtension  mExtension;
+    ELinkStatus mLinkStatus;
+    S32         mUpdateRetries;
+    S32         mMaterialIndex; // Single file can have more than one
+};
+
+class LLLocalGLTFMaterialTimer : public LLEventTimer
+{
+public:
+    LLLocalGLTFMaterialTimer();
+    ~LLLocalGLTFMaterialTimer();
+
+public:
+    void startTimer();
+    void stopTimer();
+    bool isRunning();
+    bool tick();
+};
+
+class LLLocalGLTFMaterialMgr : public LLSingleton<LLLocalGLTFMaterialMgr>
+{
+    LLSINGLETON(LLLocalGLTFMaterialMgr);
+    ~LLLocalGLTFMaterialMgr();
+public:
+    S32          addUnit(const std::vector<std::string>& filenames);
+    S32          addUnit(const std::string& filename); // file can hold multiple materials
+    void         delUnit(LLUUID tracking_id);
+
+    LLUUID       getWorldID(LLUUID tracking_id);
+    bool         isLocal(LLUUID world_id);
+    void         getFilenameAndIndex(LLUUID tracking_id, std::string &filename, S32 &index);
+
+    void         feedScrollList(LLScrollListCtrl* ctrl);
+    void         doUpdates();
+
+private:
+    std::list<LLPointer<LLLocalGLTFMaterial> >    mMaterialList;
+    LLLocalGLTFMaterialTimer           mTimer;
+    typedef std::list<LLPointer<LLLocalGLTFMaterial> >::iterator local_list_iter;
+};
+
+#endif // LL_LOCALGLTFMATERIALS_H
+