Fix line endlings

1 files changed, 74 insertions, 74 deletions

diff --git a/indra/llui/lltransutil.cpp b/indra/llui/lltransutil.cpp
index 7f44f05f2b..4af5376a8b 100644
--- a/indra/llui/lltransutil.cpp
+++ b/indra/llui/lltransutil.cpp
@@ -1,74 +1,74 @@
-/**

- * @file lltrans.cpp

- * @brief LLTrans implementation

- *

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

- */

-

-#include "linden_common.h"

-

-#include "lltransutil.h"

-

-#include "lltrans.h"

-#include "lluictrlfactory.h"

-#include "llxmlnode.h"

-#include "lldir.h"

-

-bool LLTransUtil::parseStrings(const std::string& xml_filename, const std::set<std::string>& default_args)

-{

-    LLXMLNodePtr root;

-    // Pass LLDir::ALL_SKINS to load a composite of all the individual string

-    // definitions in the default skin and the current skin. This means an

-    // individual skin can provide an xml_filename that overrides only a

-    // subset of the available string definitions; any string definition not

-    // overridden by that skin will be sought in the default skin.

-    bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root, LLDir::ALL_SKINS);

-    if (!success)

-    {

-        const std::string error_string =

-            "Second Life viewer couldn't access some of the files it needs and will be closed."

-            "\n\nPlease reinstall viewer from  https://secondlife.com/support/downloads/ and "

-            "contact https://support.secondlife.com if issue persists after reinstall.";

-        LLError::LLUserWarningMsg::show(error_string);

-        gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN);

-        LL_ERRS() << "Couldn't load string table " << xml_filename << " " << errno << LL_ENDL;

-        return false;

-    }

-

-    return LLTrans::parseStrings(root, default_args);

-}

-

-

-bool LLTransUtil::parseLanguageStrings(const std::string& xml_filename)

-{

-    LLXMLNodePtr root;

-    bool success  = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);

-

-    if (!success)

-    {

-        LLError::LLUserWarningMsg::showMissingFiles();

-        LL_ERRS() << "Couldn't load localization table " << xml_filename << LL_ENDL;

-        return false;

-    }

-

-    return LLTrans::parseLanguageStrings(root);

-}

+/**
+ * @file lltrans.cpp
+ * @brief LLTrans implementation
+ *
+ * $LicenseInfo:firstyear=2000&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$
+ */
+
+#include "linden_common.h"
+
+#include "lltransutil.h"
+
+#include "lltrans.h"
+#include "lluictrlfactory.h"
+#include "llxmlnode.h"
+#include "lldir.h"
+
+bool LLTransUtil::parseStrings(const std::string& xml_filename, const std::set<std::string>& default_args)
+{
+    LLXMLNodePtr root;
+    // Pass LLDir::ALL_SKINS to load a composite of all the individual string
+    // definitions in the default skin and the current skin. This means an
+    // individual skin can provide an xml_filename that overrides only a
+    // subset of the available string definitions; any string definition not
+    // overridden by that skin will be sought in the default skin.
+    bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root, LLDir::ALL_SKINS);
+    if (!success)
+    {
+        const std::string error_string =
+            "Second Life viewer couldn't access some of the files it needs and will be closed."
+            "\n\nPlease reinstall viewer from  https://secondlife.com/support/downloads/ and "
+            "contact https://support.secondlife.com if issue persists after reinstall.";
+        LLError::LLUserWarningMsg::show(error_string);
+        gDirUtilp->dumpCurrentDirectories(LLError::LEVEL_WARN);
+        LL_ERRS() << "Couldn't load string table " << xml_filename << " " << errno << LL_ENDL;
+        return false;
+    }
+
+    return LLTrans::parseStrings(root, default_args);
+}
+
+
+bool LLTransUtil::parseLanguageStrings(const std::string& xml_filename)
+{
+    LLXMLNodePtr root;
+    bool success  = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root);
+
+    if (!success)
+    {
+        LLError::LLUserWarningMsg::showMissingFiles();
+        LL_ERRS() << "Couldn't load localization table " << xml_filename << LL_ENDL;
+        return false;
+    }
+
+    return LLTrans::parseLanguageStrings(root);
+}