merge changes for storm-787
Showing
- doc/contributions.txt 1 addition, 0 deletionsdoc/contributions.txt
- indra/newview/app_settings/settings.xml 11 additions, 0 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llfloaterpreference.cpp 9 additions, 0 deletionsindra/newview/llfloaterpreference.cpp
- indra/newview/llfloaterpreference.h 1 addition, 0 deletionsindra/newview/llfloaterpreference.h
- indra/newview/llviewermessage.cpp 3 additions, 0 deletionsindra/newview/llviewermessage.cpp
- indra/newview/skins/default/xui/en/panel_preferences_sound.xml 18 additions, 5 deletions.../newview/skins/default/xui/en/panel_preferences_sound.xml
Loading
Please register or sign in to comment