diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-07-02 09:22:05 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-07-02 09:22:05 -0700 |
| commit | d785ec312bb7f4e77517eb44f46f276ba0129677 (patch) | |
| tree | 9686020c06681328d7150ef6a89d975bd2d418ce /indra/newview/llfeaturemanager.h | |
| parent | f8a7eda55bdd34eeb2fafed21d23d26cd25f924d (diff) | |
| parent | 2a29dbc48295ad24a8a7137a10b9d891debea978 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfeaturemanager.h')
| -rwxr-xr-x | indra/newview/llfeaturemanager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfeaturemanager.h b/indra/newview/llfeaturemanager.h index 1490c2122c..12ea691b49 100755 --- a/indra/newview/llfeaturemanager.h +++ b/indra/newview/llfeaturemanager.h @@ -166,7 +166,7 @@ protected: void initBaseMask(); - void fetchFeatureTableCoro(LLCoros::self& self, std::string name); + void fetchFeatureTableCoro(std::string name); std::map<std::string, LLFeatureList *> mMaskList; std::set<std::string> mSkippedFeatures; |