From 29b2129e1eec0dbbb909422e82766a58f14c5da3 Mon Sep 17 00:00:00 2001
From: Ima Mechanique <ima.mechanique@secondlife.com>
Date: Sat, 9 Nov 2013 11:32:08 +0000
Subject: Backed out changeset: e82d9467bec8
---
indra/llui/llkeywords.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'indra/llui/llkeywords.cpp')
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 832264f074..687c2fb31d 100755
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -34,7 +34,7 @@
#include "lltexteditor.h"
#include "llstl.h"
-inline bool LLKeywordToken::isHead(const llwchar* s) const
+inline BOOL LLKeywordToken::isHead(const llwchar* s) const
{
// strncmp is much faster than string compare
BOOL res = TRUE;
@@ -51,7 +51,7 @@ inline bool LLKeywordToken::isHead(const llwchar* s) const
return res;
}
-inline bool LLKeywordToken::isTail(const llwchar* s) const
+inline BOOL LLKeywordToken::isTail(const llwchar* s) const
{
BOOL res = TRUE;
const llwchar* t = mDelimiter.c_str();
@@ -198,7 +198,7 @@ LLColor4 LLKeywords::getColorGroup(const std::string key_in)
return LLUIColorTable::instance().getColor(ColourGroup);
}
-bool LLKeywords::initialise(ELLPath path, const std::string filename)
+BOOL LLKeywords::initialise(ELLPath path, const std::string filename)
{
mReady = false;
setFilenameSyntax( gDirUtilp->getExpandedFilename(path, filename) );
@@ -214,7 +214,7 @@ bool LLKeywords::initialise(ELLPath path, const std::string filename)
return mReady;
}
-bool LLKeywords::loadFromFile()
+BOOL LLKeywords::loadFromFile()
{
processTokens();
return true;
@@ -226,14 +226,14 @@ bool LLKeywords::loadFromFile()
* contained data to the specified LLSD object.
* @return Returns boolean true/false indicating success or failure.
*/
-bool LLKeywords::loadIntoLLSD(const std::string& filename, LLSD& data)
+BOOL LLKeywords::loadIntoLLSD(const std::string& filename, LLSD& data)
{
mLoaded = false;
llifstream file;
file.open(filename);
if(file.is_open())
{
- mLoaded = (bool)LLSDSerialize::fromXML(data, file);
+ mLoaded = (BOOL)LLSDSerialize::fromXML(data, file);
if (!mLoaded)
{
LL_WARNS("") << "Unable to deserialise file: " << filename << LL_ENDL;
--
cgit v1.2.3