Nat Goodspeed
ca1ecb921c
IQA-490: Dummy out calls to LLTrans::getString() in linux_updater.cpp.
...
It appears that the LLTrans machinery, or at least the way it's used in this
program, is buggy: linux-updater.bin has been crashing. Tracebacks and
experimentation identify LLTrans as the culprit, so replace it with baked-in
string constants copied from strings.xml. (linux-updater.bin was already
producing English-only messages because the update_install shell script that
calls it was specifically passing the English version of strings.xml.)
2012-05-03 18:07:36 -04:00
Dave Parks
8a92612fd9
merge
2011-05-16 12:34:15 -05:00
Oz Linden
0b5f662c3b
storm-1249 and chop-661
2011-05-15 12:51:47 -04:00
Richard Linden
1e6d1879a0
Automated merge with http://hg.secondlife.com/viewer-development
2011-05-13 17:02:49 -07:00
Leyla Farazha
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
Brad Payne (Vir Linden)
d6fda15c34
Fixed more build breakages due to persnickety compilers on mac/linux
2011-05-13 12:01:39 -04:00
Brad Payne (Vir Linden)
34d016ac47
removed some XML logging
2011-05-13 11:37:55 -04:00
Brad Payne (Vir Linden)
4046e0801b
merge
2011-05-13 10:29:52 -04:00
Richard Linden
166e4df278
EXP-818 FIX Use different settings to control search url for beta channel viewers
2011-05-12 18:42:44 -07:00
Dave Parks
8017900e7f
merge
2011-05-12 18:50:22 -05:00
brad kittenbrink
2a843e9a6b
Fix up alignment problems for debug build.
...
reviewed by davep.
2011-05-12 16:09:42 -07:00
brad kittenbrink
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
Dave Parks
93696ac019
merge
2011-05-12 17:39:08 -05:00
Brad Payne (Vir Linden)
40325a7347
merge
2011-05-12 18:28:45 -04:00
Brad Payne (Vir Linden)
a65cd77f40
mesh coords for whole model upload
2011-05-12 18:28:31 -04:00
Leslie Linden
bdcb177fbb
Merge
2011-05-12 13:31:33 -07:00
Leslie Linden
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
Richard Linden
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
Leyla Farazha
506646b4d0
EXP-802 fixing voice chat enabled persistence
2011-05-12 11:45:09 -07:00
Richard Linden
e18f200243
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-05-12 11:38:32 -07:00
Vadim ProductEngine
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
Oz Linden
5c9ecbcc24
merge changes for storm-1247
2011-05-13 08:48:11 -04:00
Oz Linden
8f7a6f8312
merge changes to improve build times
2011-05-13 08:47:24 -04:00
Oz Linden
0859d38e95
merge changes for vwr-24197
2011-05-13 08:46:08 -04:00
Eli Linden
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
Eli Linden
174bdbf65c
sync up with viewer-development
2011-05-12 18:06:54 -07:00
brad kittenbrink
f7a01d7b33
Merge.
2011-05-12 17:08:20 -07:00
Oz Linden
e881042125
merge changes for storm-477
2011-05-12 10:35:05 -04:00
Brad Payne (Vir Linden)
7cad431c6e
small API change
2011-05-12 10:17:08 -04:00
Leyla Farazha
524345ab0e
merge
2011-05-11 17:54:00 -07:00
Leyla Farazha
9364f995b5
EXP-783 User can accept a call and see end call option in IM window but they are in nearby voice
2011-05-11 17:52:05 -07:00
Leyla Farazha
c83eff097e
EXP-760 Selecting No Device for output and input in Sound Devices in Basic mode still results in voice having input and output - also 2 default options
2011-05-11 17:46:51 -07:00
Oz Linden
6fcf9e4817
add missed contribution credit for Ima Mechanique
2011-05-11 20:08:25 -04:00
Oz Linden
ba568b8945
y
2011-05-11 20:07:36 -04:00
Oz Linden
5ffde6fa6d
merge changes for storm-1236
2011-05-11 20:06:05 -04:00
Oz Linden
09bdefabc6
merge changes for storm-1209
2011-05-11 20:05:22 -04:00
Richard Linden
a0267151c3
EXP-813 FIX Login screen reloads when clicking on location slapp
2011-05-11 16:43:42 -07:00
Oz Linden
05697cdf29
merge changes for storm-1241
2011-05-11 19:17:34 -04:00
Oz Linden
ebc65ada21
null merge of transplant for storm-1241
2011-05-11 19:15:09 -04:00
Dave Parks
4911586023
merge
2011-05-11 17:32:53 -05:00
Dave Parks
56ba23d231
Use SSE for decoding texture coordinates.
2011-05-11 17:32:39 -05:00
Richard Linden
9dbc3301f6
EXP-809 FIX Make Script Warning/Error window scrolling behavior match that of Chat history
2011-05-11 13:14:48 -07:00
Dave Parks
8e8e846542
SH-1533 Fix for skybox going black under certain conditions.
2011-05-11 14:46:35 -05:00
Brad Payne (Vir Linden)
4c169a5750
merge
2011-05-11 15:45:41 -04:00
Brad Payne (Vir Linden)
fa77ab85f1
disable debugging stuff by default
2011-05-11 15:45:29 -04:00
Seth ProductEngine
e213a36f70
STORM-477 Restored the backed out changeset: b62b260aa04d
2011-05-11 18:12:23 +03:00
Seth ProductEngine
662bc0803c
STORM-477 Restored the backed out changeset: c9cc202293b7
2011-05-11 18:12:48 +03:00
Oz Linden
7be1755d61
merge changes for VWR-25727
2011-05-11 08:39:54 -04:00
brad kittenbrink
c9becd55bd
New build of ogg-vorbis package to fix VWR-25727.
2011-05-10 17:22:34 -07:00
brad kittenbrink
32bce75124
New build of ogg-vorbis package to fix VWR-25727.
2011-05-10 17:22:34 -07:00