merge changes for DRTVWR-203
No related branches found
No related tags found
Showing
- .hgtags 1 addition, 0 deletions.hgtags
- autobuild.xml 36 additions, 0 deletionsautobuild.xml
- doc/contributions.txt 10 additions, 1 deletiondoc/contributions.txt
- etc/message.xml 0 additions, 8 deletionsetc/message.xml
- indra/cmake/00-Common.cmake 1 addition, 0 deletionsindra/cmake/00-Common.cmake
- indra/llcharacter/llhandmotion.cpp 55 additions, 5 deletionsindra/llcharacter/llhandmotion.cpp
- indra/llinventory/llparcel.cpp 0 additions, 67 deletionsindra/llinventory/llparcel.cpp
- indra/llinventory/llparcel.h 0 additions, 7 deletionsindra/llinventory/llparcel.h
- indra/llui/llfloater.cpp 4 additions, 0 deletionsindra/llui/llfloater.cpp
- indra/llui/lltoggleablemenu.cpp 3 additions, 1 deletionindra/llui/lltoggleablemenu.cpp
- indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl 1 addition, 1 deletion...newview/app_settings/shaders/class1/deferred/avatarF.glsl
- indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl 1 addition, 1 deletion...a/newview/app_settings/shaders/class1/deferred/bumpF.glsl
- indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl 1 addition, 1 deletion...p_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl
- indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl 1 addition, 1 deletion...ngs/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl
- indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl 1 addition, 1 deletion...ngs/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl
- indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl 1 addition, 1 deletion...ewview/app_settings/shaders/class1/deferred/diffuseF.glsl
- indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl 1 addition, 1 deletion...app_settings/shaders/class1/deferred/diffuseIndexedF.glsl
- indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl 1 addition, 1 deletion...pp_settings/shaders/class1/deferred/multiPointLightF.glsl
- indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl 1 addition, 1 deletion...iew/app_settings/shaders/class1/deferred/pointLightF.glsl
- indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl 1 addition, 1 deletion...ew/app_settings/shaders/class1/deferred/softenLightF.glsl
Loading
Please register or sign in to comment