diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-07-02 07:07:23 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-02 07:07:23 -0700 |
commit | ef735d839317c5d8837c3ce9afd66cb576a2ba94 (patch) | |
tree | 12a993fde38848529cdcdbadbce2d58cc383d7d2 /indra/llui/llloadingindicator.cpp | |
parent | 9cef95ca2bf8a7194c6ce80ba744d9c936695e86 (diff) | |
parent | 1417bd3985f339915f259bf5971ef21e47e30163 (diff) |
Merged from viewer-release
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 |