Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips...
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
Showing
- indra/integration_tests/llui_libtest/llwidgetreg.cpp 2 additions, 0 deletionsindra/integration_tests/llui_libtest/llwidgetreg.cpp
- indra/llcommon/llpreprocessor.h 2 additions, 0 deletionsindra/llcommon/llpreprocessor.h
- indra/llcommon/llsafehandle.h 1 addition, 0 deletionsindra/llcommon/llsafehandle.h
- indra/llcommon/llsecondlifeurls.cpp 1 addition, 1 deletionindra/llcommon/llsecondlifeurls.cpp
- indra/llcommon/llstringtable.cpp 17 additions, 0 deletionsindra/llcommon/llstringtable.cpp
- indra/llcommon/llstringtable.h 3 additions, 15 deletionsindra/llcommon/llstringtable.h
- indra/llcommon/llversionviewer.h 1 addition, 1 deletionindra/llcommon/llversionviewer.h
- indra/llrender/llfontgl.cpp 2 additions, 1 deletionindra/llrender/llfontgl.cpp
- indra/llui/CMakeLists.txt 4 additions, 0 deletionsindra/llui/CMakeLists.txt
- indra/llui/llbutton.cpp 4 additions, 2 deletionsindra/llui/llbutton.cpp
- indra/llui/llbutton.h 3 additions, 0 deletionsindra/llui/llbutton.h
- indra/llui/llcheckboxctrl.cpp 1 addition, 1 deletionindra/llui/llcheckboxctrl.cpp
- indra/llui/llcombobox.cpp 3 additions, 3 deletionsindra/llui/llcombobox.cpp
- indra/llui/llcombobox.h 1 addition, 1 deletionindra/llui/llcombobox.h
- indra/llui/llconsole.cpp 2 additions, 2 deletionsindra/llui/llconsole.cpp
- indra/llui/llconsole.h 3 additions, 4 deletionsindra/llui/llconsole.h
- indra/llui/lldraghandle.cpp 5 additions, 4 deletionsindra/llui/lldraghandle.cpp
- indra/llui/lldraghandle.h 3 additions, 3 deletionsindra/llui/lldraghandle.h
- indra/llui/llfloater.cpp 1 addition, 1 deletionindra/llui/llfloater.cpp
- indra/llui/llfloater.h 1 addition, 1 deletionindra/llui/llfloater.h
Loading
Please register or sign in to comment