diff options
author | Richard Linden <none@none> | 2013-11-12 11:42:06 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-11-12 11:42:06 -0800 |
commit | 6ddfc8031c73f342cf8459445a20cd50ceb3efba (patch) | |
tree | 4a209fa66ac39930c089a1477a1f4eb2542ad5bb /indra/llxml | |
parent | b6688529877e9f3a46d251c64c002fbe8fd8cbb6 (diff) |
BUILDFIX - miscellaneous stuff missed in the merge
Diffstat (limited to 'indra/llxml')
-rwxr-xr-x | indra/llxml/llcontrol.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h index 8a8479f90f..04575d81e0 100755 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -395,7 +395,6 @@ class LLCachedControl public: LLCachedControl(LLControlGroup& group, const std::string& name, - const T& default_value, const std::string& comment = "Declared In Code") { @@ -406,6 +405,16 @@ public: } } + LLCachedControl(LLControlGroup& group, + const std::string& name) + { + mCachedControlPtr = LLControlCache<T>::getInstance(name); + if (mCachedControlPtr.isNull()) + { + mCachedControlPtr = new LLControlCache<T>(group, name); + } + } + operator const T&() const { return mCachedControlPtr->getValue(); } operator boost::function<const T&()> () const { return boost::function<const T&()>(*this); } const T& operator()() { return mCachedControlPtr->getValue(); } |