merge changes for DRTVWR-304
Showing
- .hgtags 1 addition, 0 deletions.hgtags
- indra/llui/lltoolbar.cpp 2 additions, 3 deletionsindra/llui/lltoolbar.cpp
- indra/newview/llfloaterimsessiontab.cpp 56 additions, 21 deletionsindra/newview/llfloaterimsessiontab.cpp
- indra/newview/llfloaterimsessiontab.h 8 additions, 2 deletionsindra/newview/llfloaterimsessiontab.h
- indra/newview/skins/default/xui/en/floater_im_session.xml 11 additions, 9 deletionsindra/newview/skins/default/xui/en/floater_im_session.xml
Loading
Please register or sign in to comment