diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 16:00:14 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 16:00:14 -0800 |
| commit | 692920768589224e852ed2f9dea0c38abf1d1e57 (patch) | |
| tree | c53db40f0a6ba132e8bc070fd388ffb5cc6a6dad | |
| parent | 417f0ede41d1dcfed45ae56f515f2ea6d63e599f (diff) | |
| parent | e7bb883153d8daad68ef5ce5876309e8fa605284 (diff) | |
merge.
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_media_browser.xml | 2 | ||||
| -rw-r--r-- | install.xml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index 4b280ac59f..70dac7e41c 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -80,7 +80,7 @@ height="20" layout="topleft" left_pad="5" - max_chars="255" + max_chars="1024" name="address" top_delta="0" width="540"> diff --git a/install.xml b/install.xml index d8b9a4289d..797bde5756 100644 --- a/install.xml +++ b/install.xml @@ -948,9 +948,9 @@ anguage Infrstructure (CLI) international standard</string> <key>darwin</key> <map> <key>md5sum</key> - <string>2eb58f544c0d912aa382de2c947be7f1</string> + <string>d97d843704514ae1b5f153fab2931920</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20100104.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20100120.tar.bz2</uri> </map> <key>linux</key> <map> @@ -962,9 +962,9 @@ anguage Infrstructure (CLI) international standard</string> <key>windows</key> <map> <key>md5sum</key> - <string>c41be1ba9728555ae5a2d2151c96dfe1</string> + <string>18c1a4059bad1504a457e70c8c218033</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100115.tar.bz2</uri> + <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100120.tar.bz2</uri> </map> </map> </map> |