Skip to content
Snippets Groups Projects
Commit 14418c19 authored by Mike Antipov's avatar Mike Antipov
Browse files

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
parents 85b62440 6885a1a6
No related branches found
No related tags found
No related merge requests found
Showing
with 81 additions and 54 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment