summaryrefslogtreecommitdiff
path: root/indra/llimage/tests/llimageworker_test.cpp
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-05-26 10:24:05 +0300
committerMike Antipov <mantipov@productengine.com>2010-05-26 10:24:05 +0300
commit14418c197076d0eb01bb0852b8716fa966bc9d53 (patch)
tree3466623f7db960a929a236c7a92fb109c581abdb /indra/llimage/tests/llimageworker_test.cpp
parent85b62440ef1127e6f3f5b853374cea51f12c37e0 (diff)
parent6885a1a6ad62f0e0e08a272911c8ac057a5cd94d (diff)
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
Diffstat (limited to 'indra/llimage/tests/llimageworker_test.cpp')
0 files changed, 0 insertions, 0 deletions