Pull merge from lindenlab/viewer-chui
Showing
- indra/llui/lltextbase.cpp 19 additions, 5 deletionsindra/llui/lltextbase.cpp
- indra/llui/lltextbase.h 2 additions, 1 deletionindra/llui/lltextbase.h
- indra/newview/llconversationlog.cpp 2 additions, 2 deletionsindra/newview/llconversationlog.cpp
- indra/newview/llconversationlog.h 1 addition, 1 deletionindra/newview/llconversationlog.h
- indra/newview/llfloaterimcontainer.cpp 17 additions, 4 deletionsindra/newview/llfloaterimcontainer.cpp
- indra/newview/llfloaterimcontainer.h 1 addition, 0 deletionsindra/newview/llfloaterimcontainer.h
- indra/newview/llimview.cpp 2 additions, 0 deletionsindra/newview/llimview.cpp
- indra/newview/llinventorypanel.cpp 1 addition, 2 deletionsindra/newview/llinventorypanel.cpp
- indra/newview/lltoastnotifypanel.cpp 3 additions, 0 deletionsindra/newview/lltoastnotifypanel.cpp
- indra/newview/skins/default/xui/en/panel_notification.xml 1 addition, 1 deletionindra/newview/skins/default/xui/en/panel_notification.xml
Loading
Please register or sign in to comment