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 /install.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 'install.xml')
| -rw-r--r-- | install.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/install.xml b/install.xml index bb2f8c1f2f..c6b6ffda81 100644 --- a/install.xml +++ b/install.xml @@ -962,9 +962,9 @@ anguage Infrstructure (CLI) international standard</string> <key>windows</key> <map> <key>md5sum</key> - <string>d682ed6232193b4eab3170657a54ebf9</string> + <string>1d9697fed57084eea7b3dc250e9c66f7</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100519.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100525.tar.bz2</uri> </map> </map> </map> |