diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-05-26 10:24:05 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-05-26 10:24:05 +0300 |
| commit | 14418c197076d0eb01bb0852b8716fa966bc9d53 (patch) | |
| tree | 3466623f7db960a929a236c7a92fb109c581abdb /indra/newview/app_settings/logcontrol.xml | |
| parent | 85b62440ef1127e6f3f5b853374cea51f12c37e0 (diff) | |
| parent | 6885a1a6ad62f0e0e08a272911c8ac057a5cd94d (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/newview/app_settings/logcontrol.xml')
| -rw-r--r-- | indra/newview/app_settings/logcontrol.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index d7bb64ce8a..16e39fc1c4 100644 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml @@ -25,6 +25,7 @@ <string>AppCache</string> <string>Window</string> <string>RenderInit</string> + <string>MediaAuth</string> </array> </map> <map> |