-
- Downloads
"README.md" did not exist on "d091644bccb012e5e4a10de7c1f03583d798d07d"
Merge skinning-14 to viewer-2, including refactoring many floaters to register...
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
Showing
- indra/integration_tests/llui_libtest/llui_libtest.cpp 38 additions, 22 deletionsindra/integration_tests/llui_libtest/llui_libtest.cpp
- indra/integration_tests/llui_libtest/llwidgetreg.cpp 38 additions, 38 deletionsindra/integration_tests/llui_libtest/llwidgetreg.cpp
- indra/integration_tests/llui_libtest/llwidgetreg.h 1 addition, 1 deletionindra/integration_tests/llui_libtest/llwidgetreg.h
- indra/llinventory/llpermissionsflags.h 0 additions, 3 deletionsindra/llinventory/llpermissionsflags.h
- indra/llrender/llfontgl.h 3 additions, 3 deletionsindra/llrender/llfontgl.h
- indra/llrender/llfontregistry.cpp 1 addition, 1 deletionindra/llrender/llfontregistry.cpp
- indra/llui/llbutton.cpp 48 additions, 37 deletionsindra/llui/llbutton.cpp
- indra/llui/llbutton.h 0 additions, 6 deletionsindra/llui/llbutton.h
- indra/llui/llcheckboxctrl.cpp 1 addition, 5 deletionsindra/llui/llcheckboxctrl.cpp
- indra/llui/llcheckboxctrl.h 0 additions, 7 deletionsindra/llui/llcheckboxctrl.h
- indra/llui/llcombobox.cpp 1 addition, 5 deletionsindra/llui/llcombobox.cpp
- indra/llui/llcombobox.h 0 additions, 8 deletionsindra/llui/llcombobox.h
- indra/llui/llcontainerview.cpp 1 addition, 1 deletionindra/llui/llcontainerview.cpp
- indra/llui/lldraghandle.h 2 additions, 2 deletionsindra/llui/lldraghandle.h
- indra/llui/llfloater.cpp 40 additions, 4 deletionsindra/llui/llfloater.cpp
- indra/llui/llfloater.h 27 additions, 16 deletionsindra/llui/llfloater.h
- indra/llui/llflyoutbutton.cpp 1 addition, 1 deletionindra/llui/llflyoutbutton.cpp
- indra/llui/lliconctrl.cpp 1 addition, 1 deletionindra/llui/lliconctrl.cpp
- indra/llui/lllayoutstack.cpp 4 additions, 4 deletionsindra/llui/lllayoutstack.cpp
- indra/llui/lllineeditor.cpp 2 additions, 6 deletionsindra/llui/lllineeditor.cpp
Loading
Please register or sign in to comment