diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2020-03-26 11:00:52 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-26 11:00:52 -0400 |
| commit | 84a7ec90b306e55740608fe3097b00cef99aec12 (patch) | |
| tree | 0827cb6f511f0e040200541ba55a0065539015a0 /indra/llappearance/llwearabletype.cpp | |
| parent | 8fb39231dbe6fb859b38c30bf79bf80ae4afbac1 (diff) | |
DRTVWR-476: Fix glitches from lindenlab/viewer master branch merge.
Diffstat (limited to 'indra/llappearance/llwearabletype.cpp')
| -rw-r--r-- | indra/llappearance/llwearabletype.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llappearance/llwearabletype.cpp b/indra/llappearance/llwearabletype.cpp index 8662345bc4..1ed845e293 100644 --- a/indra/llappearance/llwearabletype.cpp +++ b/indra/llappearance/llwearabletype.cpp @@ -57,7 +57,7 @@ struct WearableEntry : public LLDictionaryEntry BOOL mAllowMultiwear; }; -class LLWearableDictionary : public LLSingleton<LLWearableDictionary>, +class LLWearableDictionary : public LLParamSingleton<LLWearableDictionary>, public LLDictionary<LLWearableType::EType, WearableEntry> { LLSINGLETON(LLWearableDictionary, LLWearableType&); |