Manual merge from default branch.
Semi-automatically resolved conflicts in: * BuildParams * indra/newview/CMakeLists.txt * indra/newview/llviewermessage.cpp --HG-- branch : product-engine
Showing
- indra/cmake/Variables.cmake 27 additions, 4 deletionsindra/cmake/Variables.cmake
- indra/llui/llnotifications.cpp 47 additions, 111 deletionsindra/llui/llnotifications.cpp
- indra/llui/llnotifications.h 30 additions, 5 deletionsindra/llui/llnotifications.h
- indra/newview/CMakeLists.txt 5 additions, 3 deletionsindra/newview/CMakeLists.txt
- indra/newview/llchannelmanager.cpp 25 additions, 20 deletionsindra/newview/llchannelmanager.cpp
- indra/newview/llnotificationstorage.cpp 228 additions, 0 deletionsindra/newview/llnotificationstorage.cpp
- indra/newview/llnotificationstorage.h 65 additions, 0 deletionsindra/newview/llnotificationstorage.h
- indra/newview/llpanelgroup.h 1 addition, 1 deletionindra/newview/llpanelgroup.h
- indra/newview/llscriptfloater.cpp 10 additions, 0 deletionsindra/newview/llscriptfloater.cpp
- indra/newview/llscriptfloater.h 2 additions, 0 deletionsindra/newview/llscriptfloater.h
- indra/newview/lltexturefetch.cpp 6 additions, 0 deletionsindra/newview/lltexturefetch.cpp
- indra/newview/lltoastnotifypanel.cpp 1 addition, 1 deletionindra/newview/lltoastnotifypanel.cpp
- indra/newview/llviewermessage.cpp 54 additions, 4 deletionsindra/newview/llviewermessage.cpp
- indra/newview/llviewermessage.h 20 additions, 5 deletionsindra/newview/llviewermessage.h
- indra/newview/skins/default/xui/en/notifications.xml 4 additions, 0 deletionsindra/newview/skins/default/xui/en/notifications.xml
Loading
Please register or sign in to comment