diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-06-22 15:02:19 -0700 |
| commit | baa73fddd9287ddafd2d31551cb253b355ed910a (patch) | |
| tree | e3f0986617fe6c0ee0a14df6aac13c6bb6f92507 /indra/newview/lljoystickbutton.cpp | |
| parent | dc3833f31b8a20220ddb1775e1625c016c397435 (diff) | |
| parent | fcaa1ad46fd1df4cfec9dee12caf6e7b5bf32136 (diff) | |
Merge with viewer-2.0.0-3 branch
Diffstat (limited to 'indra/newview/lljoystickbutton.cpp')
| -rw-r--r-- | indra/newview/lljoystickbutton.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/lljoystickbutton.cpp b/indra/newview/lljoystickbutton.cpp index 539d889c51..8e6889a379 100644 --- a/indra/newview/lljoystickbutton.cpp +++ b/indra/newview/lljoystickbutton.cpp @@ -49,11 +49,11 @@ #include "llglheaders.h" -static LLRegisterWidget<LLJoystickAgentSlide> r1("joystick_slide"); -static LLRegisterWidget<LLJoystickAgentTurn> r2("joystick_turn"); -static LLRegisterWidget<LLJoystickCameraRotate> r3("joystick_rotate"); -static LLRegisterWidget<LLJoystickCameraZoom> r4("joystick_zoom"); -static LLRegisterWidget<LLJoystickCameraTrack> r5("joystick_track"); +static LLDefaultWidgetRegistry::Register<LLJoystickAgentSlide> r1("joystick_slide"); +static LLDefaultWidgetRegistry::Register<LLJoystickAgentTurn> r2("joystick_turn"); +static LLDefaultWidgetRegistry::Register<LLJoystickCameraRotate> r3("joystick_rotate"); +static LLDefaultWidgetRegistry::Register<LLJoystickCameraZoom> r4("joystick_zoom"); +static LLDefaultWidgetRegistry::Register<LLJoystickCameraTrack> r5("joystick_track"); |