eb8f5d843f
storm-1267
2011-05-18 18:27:17 -04:00
c351b94723
merge changes for login-messages
2011-05-18 18:26:19 -04:00
35f394cd63
merge changes for storm-859
2011-05-18 18:24:13 -04:00
2414417210
Automated merge with http://hg.secondlife.com/viewer-development
2011-05-18 15:33:17 -04:00
03f7063c0b
merge
2011-05-18 13:58:29 -05:00
63118cacad
Remove extraneous width declaration at behest of eli.
2011-05-18 13:58:12 -05:00
644cbc4487
merge notifications.xml fix
2011-05-17 19:29:45 -04:00
9075e1104f
fix merge error in open source configurations to disable proprietary components
2011-05-17 19:26:18 -04:00
fe22feea99
remove junk from after close tag
2011-05-17 19:25:37 -04:00
4297b530d3
Merge cleanup
2011-05-17 18:25:33 -05:00
cb936d097f
pull back fix for STORM-1260 from beta branch
2011-05-17 18:47:51 -04:00
bd37b14e92
BUILDFIX: copy/paste error in mesh autobuild.xml causes configure to fail.
...
copy/paste error in autobuild.xml caused INSTALL_PROPRIETARY to be set to TRUE
for OS builds. This causes configure to fail as llconvexdecomposition is not
available to OS devs. Changing INSTALL_PROPRIETARY to false for OS devs so
that llconvexdecompositionstub is used instead. problem only affects windows
builds.
2011-05-17 17:25:38 -04:00
55665d99a4
un-hardcode the viewer name merged in from the mesh branch
2011-05-17 16:54:51 -04:00
32313dd3c6
STORM-1260 FIXED Replaced llerrs messages with llwarns in directory iterator code to avoid viewer halt when a cache dir is not found.
2011-05-17 20:22:46 +03:00
79459bc9ba
Restore reference to $last_built_variant when computing path to the Windows Installer
2011-05-17 11:06:33 -04:00
6c61e85fc4
VWR-22299 Error strings for login failure conditions
2011-05-16 14:14:24 -07:00
26f321bf65
merge
2011-05-16 16:11:56 -05:00
113f532ee5
Added tag 2.6.9-start for changeset e67da2c6e312
2011-05-16 14:57:22 -04:00
92426cce0c
remove new search in favor of moving to a project viewer
2011-05-16 14:57:15 -04:00
6ddd79be06
Added tag 2.6.9-start for changeset 11d5d8080e67
2011-05-16 14:55:34 -04:00
8ae550996c
Merge cleanup.
2011-05-16 13:48:55 -05:00
8a92612fd9
merge
2011-05-16 12:34:15 -05:00
cfad224f1c
Merge
2011-05-16 10:09:53 -07:00
f440cd4af6
WIP viewer side of ER-864: comment change
2011-05-16 10:08:09 -07:00
d7d94460d0
STORM-859 : Replacing winres.h with windows.h so that the viewer will build with-out
...
having to copy any files to the source tree when useing express versions of
Visual Studio.
2011-05-15 21:57:27 -04:00
0b5f662c3b
storm-1249 and chop-661
2011-05-15 12:51:47 -04:00
1e6d1879a0
Automated merge with http://hg.secondlife.com/viewer-development
2011-05-13 17:02:49 -07:00
039b6baf06
EXP-783 User can accept a call and see end call option in IM window but they are in nearby voice
2011-05-13 11:01:36 -07:00
d6fda15c34
Fixed more build breakages due to persnickety compilers on mac/linux
2011-05-13 12:01:39 -04:00
34d016ac47
removed some XML logging
2011-05-13 11:37:55 -04:00
4046e0801b
merge
2011-05-13 10:29:52 -04:00
166e4df278
EXP-818 FIX Use different settings to control search url for beta channel viewers
2011-05-12 18:42:44 -07:00
8017900e7f
merge
2011-05-12 18:50:22 -05:00
2a843e9a6b
Fix up alignment problems for debug build.
...
reviewed by davep.
2011-05-12 16:09:42 -07:00
b3dddbf30b
Fix for error in debug build accessing beyond the end of a vector.
...
reviewed by davep.
2011-05-12 16:09:29 -07:00
93696ac019
merge
2011-05-12 17:39:08 -05:00
40325a7347
merge
2011-05-12 18:28:45 -04:00
a65cd77f40
mesh coords for whole model upload
2011-05-12 18:28:31 -04:00
bdcb177fbb
Merge
2011-05-12 13:31:33 -07:00
4268700fcf
SH-1521 update -- Lighting and Shadows grayed out on mac
...
* Disabled SSAO on macs with 8 or less texture units.
* Slight cleanup of sunlight fragment shaders to remove unused texture units.
Reviewed by davep
2011-05-12 13:30:47 -07:00
4e02747908
Automated merge with bundle:F:\code\viewer-experience-merge+c:\users\richard\appdata\local\temp\thg.7nrmxq\ssh__richard@hg.lindenlab.com_richard_viewer-experience_gittck.hg
2011-05-12 13:20:09 -07:00
506646b4d0
EXP-802 fixing voice chat enabled persistence
2011-05-12 11:45:09 -07:00
e18f200243
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-05-12 11:38:32 -07:00
e8ede07451
STORM-1243 WIP Fixed a typo in notifications.xml which might lead to numerous notification handling errors.
...
The typo was introduced in changeset 437f3d892bfd.
2011-05-12 21:17:10 +03:00
5c9ecbcc24
merge changes for storm-1247
2011-05-13 08:48:11 -04:00
8f7a6f8312
merge changes to improve build times
2011-05-13 08:47:24 -04:00
0859d38e95
merge changes for vwr-24197
2011-05-13 08:46:08 -04:00
22e2cee6c0
WIP VWR-23688 adding es and pt missing translation; add 1 zh file for testing Traditional Chinese as a new language
2011-05-12 18:17:35 -07:00
174bdbf65c
sync up with viewer-development
2011-05-12 18:06:54 -07:00
f7a01d7b33
Merge.
2011-05-12 17:08:20 -07:00
Oz Linden