summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorIma Mechanique <ima.mechanique@secondlife.com>2013-11-11 16:33:04 +0000
committerIma Mechanique <ima.mechanique@secondlife.com>2013-11-11 16:33:04 +0000
commit3e41917403fb3519adac2343ca21a1f289596621 (patch)
treea9af2889f2197fc2d5901934eec95cd74633be5d /indra
parentf6d8e55eb9e9ec377e3a9ce9b25de702c3239090 (diff)
Removing no longer used member variable, adding method to reset the mLoaded status
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llui/llkeywords.cpp4
-rwxr-xr-xindra/llui/llkeywords.h1
2 files changed, 3 insertions, 2 deletions
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);