3f05d552fe
Merged in my fix of bogus libtcmalloc_minimal.dll packaging.
2009-09-28 11:03:00 -07:00
76dd0fd2cf
merge
2009-09-25 19:25:25 -07:00
17f9fd5f96
Changes force no crt manifest linking in windows plugin files.
2009-09-25 19:23:24 -07:00
16ac0ec91d
Merge up to current viewer/viewer-20
2009-09-25 16:33:16 -04:00
ec52e19dd1
DEV-32777, QAR-1619: Disable MSVC Release-build optimization for LLCoros::launchImpl().
...
This fixes the Release-build crash in lllogin_test.cpp.
2009-09-25 10:55:25 -04:00
c3e8c1f738
Disable MSVC "fatal warning" 4702 for boost::lexical_cast in Release build
2009-09-24 13:46:02 -04:00
0eedd1d9e8
Oops libtcmalloc_minimal.dll was being packaged in a subdir it shouldn't have been.
2009-09-23 19:46:36 -04:00
bd0c306752
Add pth-2.0.7-linden.txt with S3 URL for the original Pth source tarball.
...
Add this file to pth.txt manifest file.
Update install.xml with the URL for new pth-2.0.7-darwin-20090923.tar.bz2.
2009-09-23 12:25:44 -04:00
28ae55538c
ND-37009: Add Pth license text to licenses-mac.txt
2009-09-22 16:58:43 -04:00
68c7cd2a10
ND-37009: re-add Pth to list of licenses in floater_about.xml
2009-09-22 16:25:50 -04:00
8ddc0c0ac4
Viewer-2-0 has no dependencies on externals, so remove them after merging in the "daggy fix" for build scripts.
2009-09-22 11:50:03 -07:00
103ba961e4
Automated merge with ssh://hg.lindenlab.com/viewer/login-api/
2009-09-22 11:13:54 -04:00
a4c6e3610a
Import inventory template fix from viewer/viewer-2.0.0-3 rev 133575.
2009-09-22 11:09:15 -04:00
b5ed4fec54
New package of zlib since I broke the name of the debug .lib.
2009-09-21 18:51:50 -04:00
008d21eb44
New build of googlemock generated against the right CRT build to fix DLL hell.
2009-09-21 18:51:22 -04:00
6f4b9d63f8
Added dependcies to create_app_config_file.
...
Further Clean up of dll copying merge mess.
2009-09-18 19:29:18 -07:00
afb053ebd7
Minor tweaks of test_win32_manifest output.
2009-09-18 19:30:10 -04:00
05739cf8ac
Merged my recent viewer/viewer-20 + login-api merge with latest login-api including DLL hell library changes.
2009-09-18 16:33:15 -04:00
3380c7d9a2
Fixups for LLStringUtil link errors after the merge.
2009-09-18 16:25:22 -04:00
bb1d4592bd
Merged latest viewer/viewer-20 into login-api.
2009-09-18 15:22:25 -04:00
128c3dfc74
Applied patch for SLPlugin location from:
...
r133676 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-6
2009-09-18 11:29:28 -07:00
a56efcd7e4
Merged in my CRT dll hell library changes.
2009-09-17 20:03:56 -04:00
4489a018ca
Merged my daggy fix to the broken curl package with later library work.
2009-09-17 20:00:58 -04:00
9615727329
New build of windows freetype to fix CRT dll hell. This also upgrades to 2.3.9 (DEV-32831). When this merges to viewer-2.0 it should replace the build there.
2009-09-17 19:58:59 -04:00
5b98de7a4b
Fix for broken jpeglib package I just uploaded.
2009-09-17 19:49:10 -04:00
8ae5de0e31
Fix for broken windows curl package I just built. Still version 7.19.6 as per DEV-28321.
2009-09-17 19:45:00 -04:00
8e8a5bd24f
Rebuilt the following libs to fix CRT dll hell: ares expat jpeglib libpng ndofdev xmlrpc-epi zlib
2009-09-17 17:41:16 -04:00
c2623d5ab4
Rebuilding of windows curl to fix CRT dll hell. Also upgrading to 7.19.6 to avoid the need for special patching (see DEV-28321 vulnerability).
2009-09-17 16:24:16 -04:00
33130868b2
Rebuild windows apr to fix CRT dll hell. Also upgrading to apr-1.3.8/apr-util-1.3.9 in the process for DEV-38196 vulnerability.
2009-09-17 16:05:02 -04:00
a84b98e31e
Rebuilt windows boost for CRT version DLL hell, upgrading to 1.39 in the process.
2009-09-17 15:51:29 -04:00
422b9c5872
Relocate build.sh to the top of the source tree.
2009-09-16 21:50:40 -07:00
91645140d4
merge
2009-09-16 11:42:20 -07:00
8e7ba92eb9
More specific exepction handling to support correct crt_checking failures.
2009-09-15 16:33:00 -07:00
9496b1ff45
merge
2009-09-15 12:39:28 -07:00
93869a8ef2
Fixed up CopyWinLibs.cmake post moap/viewer-2.0.0-3 merge.
...
Added CRT assembly check to viewer_manifest.py.
twiddled test_win32_manifest.py for ease of use.
2009-09-15 12:32:22 -07:00
03cfd32828
DEV-39949 Normalize fonts across systems
...
This attempts to be pretty close to the 80-20 style guide (sizewise probably a bit closer than we were before) while remaining pragmatically close to what we've already been using in viewer2.
The main goal is to bring fonts to parity across all platforms to the extent that truncation issues and layout glitches need to be fixed and tested on only one platform, not 3+.
2009-09-14 21:36:04 +00:00
562006aa55
Merge with SVN viewer-2.0.0-3 branch
2009-09-14 14:31:25 -07:00
9a13b059dc
DEV-38598: More closely align new login-failure control flow with viewer-2.
...
In the viewer-2 code base, the "tos" case is detected inline, a sibling of the
other types of login failure, and doesn't reach the notification. Our new
logic needs to detect "tos" as well.
Also, the case of process_login_success_response() returning false was
inconsistent, attempting a notification with an empty string.
2009-09-14 16:48:31 -04:00
7cd1020f29
DEV-39188: Removed the custom support for secondlife:///app/events and
...
secondlife:///app/classifieds URLs because we do not have handlers for
these SLAPPs in 2.0.
Added support for secondlife://<location/<x>/<y>/<z> URLs, in addition
to the http://slurl.com SLURLs.
Also optimized LLUrlRegistry:findUrl() so that it avoids lots of
expensive regex calls when there is no URL in the text.
2009-09-14 20:01:20 +00:00
1d985532e9
EXT-940 Add new art to viewer - 9/14/09
2009-09-14 18:41:40 +00:00
b7b3685571
DEV-35097 change 1 more instance of the term SLURL to the proper trademark guideline, SLurl
2009-09-14 17:49:35 +00:00
a81a89b5c7
QAR-1619: reconcile redundant SLPlugin.exe copy_if_different with viewer_manifest.py
2009-09-14 13:39:23 -04:00
cb926640b7
DEV-15182 VWR-5474 SEC-20: re-enabled support for clicking on the
...
following SLAPP URL types in an untrusted browser:
secondlife:///app/agent/...
secondlife:///app/group/...
secondlife:///app/parcel/...
In order to find a compromise between supporting these commands and
security concerns over potential griefing vectors, we use a throttling
solution when these commands are issued by untrusted web browsers.
That is, we only process one command per 15 seconds.
This applies to external browsers, like Firefox, as well as the
internal SL browser.
Notably, we continue to block secondlife:///app/teleport URLs.
Reviewed by james.
2009-09-14 17:09:45 +00:00
b3ae33703b
Merge changes
2009-09-14 09:22:43 -04:00
7dca49b0f2
QAR-1619: At Sam's request, move SLPlugin to viewer executable dir, consistent with Mac and Linux.
2009-09-14 09:16:19 -04:00
5f4764c785
DEV-39188: clicking on unsupported secondlife:///app/ SLURLs now
...
brings up a notification telling you this; rather than displaying
the Place side panel with N/A information.
Now, if you click on an Event or Classified SLURL, you get this
unsupported alert (2.0 does not have side panels for these types
of assets, instead they are integrated into Search).
2009-09-14 11:49:01 +00:00
b6c716e50f
EXT-804 Preferences > General does not show the static text, or combo_box for Maturity rating -- to be reviewed
2009-09-14 06:45:55 +00:00
39f446fdab
People and Me panel layout changes - significantly closer to spec. Widened sidebar to 313px. EXT-562 EXT-892
2009-09-14 01:14:54 +00:00
9a8042d5a3
Adapt the build script so it can be invoked from a developer checkout.
2009-09-13 15:32:28 -07:00
cd3f75fc24
fixed type-o in textures.xml
2009-09-13 22:21:13 +00:00
brad kittenbrink