Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
No related branches found
No related tags found
Showing
- indra/llui/lluicolortable.cpp 10 additions, 3 deletionsindra/llui/lluicolortable.cpp
- indra/newview/llfloaterpreference.cpp 14 additions, 55 deletionsindra/newview/llfloaterpreference.cpp
- indra/newview/llfloaterpreference.h 4 additions, 1 deletionindra/newview/llfloaterpreference.h
- indra/newview/lltexturecache.cpp 2 additions, 0 deletionsindra/newview/lltexturecache.cpp
- indra/newview/skins/default/xui/en/panel_bottomtray.xml 7 additions, 4 deletionsindra/newview/skins/default/xui/en/panel_bottomtray.xml
- indra/newview/skins/default/xui/en/panel_preferences_chat.xml 65 additions, 17 deletions...a/newview/skins/default/xui/en/panel_preferences_chat.xml
Loading
Please register or sign in to comment