merge changes for storm-1708
Showing
- doc/contributions.txt 1 addition, 0 deletionsdoc/contributions.txt
- indra/llui/lltexteditor.cpp 26 additions, 0 deletionsindra/llui/lltexteditor.cpp
- indra/llui/lltexteditor.h 5 additions, 0 deletionsindra/llui/lltexteditor.h
- indra/newview/llfilepicker.cpp 40 additions, 1 deletionindra/newview/llfilepicker.cpp
- indra/newview/llfilepicker.h 2 additions, 0 deletionsindra/newview/llfilepicker.h
- indra/newview/llfloaternamedesc.cpp 21 additions, 0 deletionsindra/newview/llfloaternamedesc.cpp
- indra/newview/llfloaternamedesc.h 9 additions, 1 deletionindra/newview/llfloaternamedesc.h
- indra/newview/llpreviewscript.cpp 95 additions, 0 deletionsindra/newview/llpreviewscript.cpp
- indra/newview/llpreviewscript.h 6 additions, 0 deletionsindra/newview/llpreviewscript.h
- indra/newview/llviewerfloaterreg.cpp 2 additions, 1 deletionindra/newview/llviewerfloaterreg.cpp
- indra/newview/skins/default/xui/en/panel_script_ed.xml 16 additions, 6 deletionsindra/newview/skins/default/xui/en/panel_script_ed.xml
- indra/newview/skins/default/xui/en/strings.xml 28 additions, 27 deletionsindra/newview/skins/default/xui/en/strings.xml
Loading
Please register or sign in to comment