From 52aeaa32841e7d0b37abab0a2a2540c2be2f16b7 Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 7 Jul 2009 00:53:05 +0000 Subject: Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14 --- indra/newview/lljoystickbutton.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/lljoystickbutton.cpp') diff --git a/indra/newview/lljoystickbutton.cpp b/indra/newview/lljoystickbutton.cpp index 8e6889a379..d63eebfcac 100644 --- a/indra/newview/lljoystickbutton.cpp +++ b/indra/newview/lljoystickbutton.cpp @@ -49,11 +49,11 @@ #include "llglheaders.h" -static LLDefaultWidgetRegistry::Register r1("joystick_slide"); -static LLDefaultWidgetRegistry::Register r2("joystick_turn"); -static LLDefaultWidgetRegistry::Register r3("joystick_rotate"); -static LLDefaultWidgetRegistry::Register r4("joystick_zoom"); -static LLDefaultWidgetRegistry::Register r5("joystick_track"); +static LLDefaultChildRegistry::Register r1("joystick_slide"); +static LLDefaultChildRegistry::Register r2("joystick_turn"); +static LLDefaultChildRegistry::Register r3("joystick_rotate"); +static LLDefaultChildRegistry::Register r4("joystick_zoom"); +static LLDefaultChildRegistry::Register r5("joystick_track"); -- cgit v1.2.3