diff options
| author | Richard Linden <none@none> | 2010-07-01 15:35:08 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-01 15:35:08 -0700 |
| commit | e21143ef5d40b03df3ee864566dadc4cde77cd74 (patch) | |
| tree | 1afc459d9c51a2d1a24e8359e4991f0ecb62a9e6 /indra/llui/llloadingindicator.cpp | |
| parent | 708c93165763d1192168498cdf7af172d144a203 (diff) | |
| parent | ff7a83323dbcb105899f75432403ca3037a2d612 (diff) | |
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 |