Merge from default branch, resolving conflict in indra/newview/llinventorybridge.cpp
LLObjectBridge::openItem() was concurrency modified. Applied behavior that was changed in c3220f7f7699 according to VWR-13743 FIXED Change Request: Change double click action for inventory wearables DEV-33391 FIXED Change Request: Change double click action for inventory wearables --HG-- branch : product-engine
No related branches found
No related tags found
Showing
- indra/llxuixml/llinitparam.h 1 addition, 1 deletionindra/llxuixml/llinitparam.h
- indra/newview/app_settings/logcontrol.xml 1 addition, 0 deletionsindra/newview/app_settings/logcontrol.xml
- indra/newview/app_settings/settings.xml 13 additions, 2 deletionsindra/newview/app_settings/settings.xml
- indra/newview/gpu_table.txt 4 additions, 4 deletionsindra/newview/gpu_table.txt
- indra/newview/llappearancemgr.cpp 2 additions, 2 deletionsindra/newview/llappearancemgr.cpp
- indra/newview/llfloateruipreview.cpp 11 additions, 3 deletionsindra/newview/llfloateruipreview.cpp
- indra/newview/llinventorybridge.cpp 3 additions, 13 deletionsindra/newview/llinventorybridge.cpp
- indra/newview/llinventorymodel.cpp 2 additions, 0 deletionsindra/newview/llinventorymodel.cpp
- indra/newview/lltexlayer.cpp 1 addition, 1 deletionindra/newview/lltexlayer.cpp
- indra/newview/llviewermedia.cpp 1 addition, 1 deletionindra/newview/llviewermedia.cpp
- indra/newview/llviewertexture.cpp 6 additions, 0 deletionsindra/newview/llviewertexture.cpp
- indra/newview/llvoavatarself.cpp 18 additions, 16 deletionsindra/newview/llvoavatarself.cpp
- indra/newview/llvoavatarself.h 11 additions, 9 deletionsindra/newview/llvoavatarself.h
- indra/newview/llwearable.cpp 1 addition, 1 deletionindra/newview/llwearable.cpp
- indra/newview/skins/default/textures/textures.xml 5 additions, 0 deletionsindra/newview/skins/default/textures/textures.xml
- indra/newview/skins/default/textures/widgets/bevel_background.png 0 additions, 0 deletions...wview/skins/default/textures/widgets/bevel_background.png
- indra/newview/skins/default/textures/widgets/buy_off.png 0 additions, 0 deletionsindra/newview/skins/default/textures/widgets/buy_off.png
- indra/newview/skins/default/textures/widgets/buy_over.png 0 additions, 0 deletionsindra/newview/skins/default/textures/widgets/buy_over.png
- indra/newview/skins/default/textures/widgets/buy_press.png 0 additions, 0 deletionsindra/newview/skins/default/textures/widgets/buy_press.png
- indra/newview/skins/default/xui/en/floater_about_land.xml 1 addition, 1 deletionindra/newview/skins/default/xui/en/floater_about_land.xml
Loading
Please register or sign in to comment