From 3e41917403fb3519adac2343ca21a1f289596621 Mon Sep 17 00:00:00 2001
From: Ima Mechanique <ima.mechanique@secondlife.com>
Date: Mon, 11 Nov 2013 16:33:04 +0000
Subject: Removing no longer used member variable, adding method to reset the
mLoaded status
---
indra/llui/llkeywords.cpp | 4 ++--
indra/llui/llkeywords.h | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
(limited to 'indra')
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 65ede3e46f..6aeaf4798b 100755
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -201,8 +201,8 @@ LLColor4 LLKeywords::getColorGroup(const std::string key_in)
bool LLKeywords::initialise(LLSD SyntaxXML)
{
mSyntax = SyntaxXML;
- mLoaded = mReady = true;
- return mReady;
+ mLoaded = true;
+ return mLoaded;
}
///**
diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h
index f14605157d..074cedfc63 100755
--- a/indra/llui/llkeywords.h
+++ b/indra/llui/llkeywords.h
@@ -110,6 +110,7 @@ public:
~LLKeywords();
void addColorGroup(const std::string key_in, const LLColor4 color);
+ void clearLoaded() { mLoaded = false; }
LLColor4 getColorGroup(const std::string key_in);
BOOL loadFromFile();
BOOL loadFromFile(const std::string& filename);
--
cgit v1.2.3