diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-12-13 14:12:42 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-03-25 19:25:41 -0400 |
| commit | c50db833656c424bb398cd91a46f478ca8b72b23 (patch) | |
| tree | 4757a5fafc5918711f296e585f9a25006a47747a /indra/llcommon | |
| parent | 5689b311c71b309bbe04c7f6357a551ca37a4dc5 (diff) | |
DRTVWR-476: Fix merge glitch.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llsingleton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsingleton.cpp b/indra/llcommon/llsingleton.cpp index 2439a6b5fd..9846031512 100644 --- a/indra/llcommon/llsingleton.cpp +++ b/indra/llcommon/llsingleton.cpp @@ -117,7 +117,7 @@ private: // stack for every running coroutine. Therefore this stack must be based // on a coroutine-local pointer. // This local_ptr isn't static because it's a member of an LLSingleton. - LLCoros::local_ptr<LLSingletonBase::list_t> mInitializing; + LLCoros::local_ptr<list_t> mInitializing; public: // Instantiate this to obtain a reference to the coroutine-specific |