merge changes for storm-1630
No related branches found
No related tags found
Showing
- indra/llui/llnotificationtemplate.h 2 additions, 2 deletionsindra/llui/llnotificationtemplate.h
- indra/llui/llscrollcontainer.cpp 9 additions, 0 deletionsindra/llui/llscrollcontainer.cpp
- indra/llui/llscrollcontainer.h 1 addition, 0 deletionsindra/llui/llscrollcontainer.h
- indra/llui/lluictrlfactory.h 3 additions, 3 deletionsindra/llui/lluictrlfactory.h
- indra/llxuixml/llinitparam.h 102 additions, 11 deletionsindra/llxuixml/llinitparam.h
- indra/llxuixml/llxuiparser.cpp 1 addition, 2 deletionsindra/llxuixml/llxuiparser.cpp
- indra/newview/llfolderview.cpp 1 addition, 1 deletionindra/newview/llfolderview.cpp
- indra/newview/llpanelmarketplaceinboxinventory.cpp 2 additions, 5 deletionsindra/newview/llpanelmarketplaceinboxinventory.cpp
- indra/newview/skins/default/xui/en/notifications.xml 85 additions, 83 deletionsindra/newview/skins/default/xui/en/notifications.xml
Loading
Please register or sign in to comment