diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-02 12:40:38 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-02 12:40:38 -0400 |
| commit | 695671d51e1bb7c1039fffa057d0477210aca308 (patch) | |
| tree | dcabd143ec6c27178b6616d9efaa98d108146056 /indra/llui/llloadingindicator.cpp | |
| parent | 655c3dbe1b711389c1f581f4ccae07dafb5cdefd (diff) | |
| parent | 1417bd3985f339915f259bf5971ef21e47e30163 (diff) | |
automated merge
Diffstat (limited to 'indra/llui/llloadingindicator.cpp')
| -rw-r--r-- | indra/llui/llloadingindicator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llloadingindicator.cpp b/indra/llui/llloadingindicator.cpp index f8b029e19c..2ad5c5a530 100644 --- a/indra/llui/llloadingindicator.cpp +++ b/indra/llui/llloadingindicator.cpp @@ -41,7 +41,8 @@ #include "lluictrlfactory.h" #include "lluiimage.h" -static LLDefaultChildRegistry::Register<LLLoadingIndicator> r("loading_indicator"); +// registered in llui.cpp to avoid being left out by MS linker +//static LLDefaultChildRegistry::Register<LLLoadingIndicator> r("loading_indicator"); /////////////////////////////////////////////////////////////////////////////// // LLLoadingIndicator::Data class |