diff options
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lllayoutstack.h | 2 | ||||
| -rw-r--r-- | indra/llui/llsdparam.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index c7e27b6866..4316d9bc46 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -142,7 +142,7 @@ private: class LLLayoutPanel : public LLPanel { -friend LLLayoutStack; +friend class LLLayoutStack; friend class LLUICtrlFactory; public: struct Params : public LLInitParam::Block<Params, LLPanel::Params> diff --git a/indra/llui/llsdparam.h b/indra/llui/llsdparam.h index 83c958d67d..c42358178a 100644 --- a/indra/llui/llsdparam.h +++ b/indra/llui/llsdparam.h @@ -93,7 +93,8 @@ class LLSDParamAdapter : public T LLSDParamAdapter() {} LLSDParamAdapter(const LLSD& sd) { - LLParamSDParser::instance().readSD(sd, *this); + LLParamSDParser parser; + parser.readSD(sd, *this); } LLSDParamAdapter(const T& val) |