diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 17:16:27 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 17:16:27 +0000 |
commit | ade6bbb06c6a842f39a3fe32decf7c66682df092 (patch) | |
tree | 8fa1e4ba680f916bb4c77c70f2464f295a3bd3f3 /indra/llui/llflyoutbutton.cpp | |
parent | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (diff) |
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
Diffstat (limited to 'indra/llui/llflyoutbutton.cpp')
-rw-r--r-- | indra/llui/llflyoutbutton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llflyoutbutton.cpp b/indra/llui/llflyoutbutton.cpp index 62a321dc02..8846f2a8c4 100644 --- a/indra/llui/llflyoutbutton.cpp +++ b/indra/llui/llflyoutbutton.cpp @@ -35,7 +35,7 @@ // file includes #include "llflyoutbutton.h" -static LLDefaultWidgetRegistry::Register<LLFlyoutButton> r2("flyout_button"); +//static LLDefaultWidgetRegistry::Register<LLFlyoutButton> r2("flyout_button"); const S32 FLYOUT_BUTTON_ARROW_WIDTH = 24; |