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
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
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
cd42197298
Added tag DRTVWR-55_2.6.8-beta1, 2.6.8-beta1 for changeset beafa8a9bd1d
2011-05-12 18:09:04 -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
f7a01d7b33
Merge.
2011-05-12 17:08:20 -07:00
e881042125
merge changes for storm-477
2011-05-12 10:35:05 -04:00
7cad431c6e
small API change
2011-05-12 10:17:08 -04:00
ad0cb157fe
STORM-1175 Fixing close button, for Custom Port warning, in Preferences => Setup => Network.
2011-05-12 11:42:46 +01:00
524345ab0e
merge
2011-05-11 17:54:00 -07:00
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
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
48a5f6a9f2
Merge
2011-05-11 17:37:32 -07:00
e54e9b4eed
WIP: viewer side of ER-864: Include message ids and args in login.cgi responses
...
* Look for message_id and message_args in XMLRPC response, look up localized string in strings.xml
* Support sub-maps in XMLRPC response conversion to LLSD
* Explicitly request extended error info during login (since including sub-maps breaks older viewers)
* Support LLSD-based substitutions in LLTrans::getString/findString
2011-05-11 17:36:11 -07:00
6fcf9e4817
add missed contribution credit for Ima Mechanique
2011-05-11 20:08:25 -04:00
ba568b8945
y
2011-05-11 20:07:36 -04:00
5ffde6fa6d
merge changes for storm-1236
2011-05-11 20:06:05 -04:00
09bdefabc6
merge changes for storm-1209
2011-05-11 20:05:22 -04:00
a0267151c3
EXP-813 FIX Login screen reloads when clicking on location slapp
2011-05-11 16:43:42 -07:00
05697cdf29
merge changes for storm-1241
2011-05-11 19:17:34 -04:00
ebc65ada21
null merge of transplant for storm-1241
2011-05-11 19:15:09 -04:00
4911586023
merge
2011-05-11 17:32:53 -05:00
56ba23d231
Use SSE for decoding texture coordinates.
2011-05-11 17:32:39 -05:00
9dbc3301f6
EXP-809 FIX Make Script Warning/Error window scrolling behavior match that of Chat history
2011-05-11 13:14:48 -07:00
8e8e846542
SH-1533 Fix for skybox going black under certain conditions.
2011-05-11 14:46:35 -05:00
4c169a5750
merge
2011-05-11 15:45:41 -04:00
fa77ab85f1
disable debugging stuff by default
2011-05-11 15:45:29 -04:00
e213a36f70
STORM-477 Restored the backed out changeset: b62b260aa04d
2011-05-11 18:12:23 +03:00
662bc0803c
STORM-477 Restored the backed out changeset: c9cc202293b7
2011-05-11 18:12:48 +03:00
7be1755d61
merge changes for VWR-25727
2011-05-11 08:39:54 -04:00
c9becd55bd
New build of ogg-vorbis package to fix VWR-25727.
2011-05-10 17:22:34 -07:00
32bce75124
New build of ogg-vorbis package to fix VWR-25727.
2011-05-10 17:22:34 -07:00
f1c4c9d237
EXP-806 FIX Server-side messages without a corresponding notification should show original, untranslated content
2011-05-10 17:11:05 -07:00
d86eb3dd42
merge changes for beta fixes
2011-05-10 17:46:32 -04:00
a52019d6d1
SH-1521 FIX -- Lighting and Shadows grayed out on mac
...
* Modified mac feature table to bring it up to date with latest renderer features including deferred rendering
* Changed mac AGL pixel format to no longer allow it to revert to software rendering when shader compilation errors occur.
* Fixed up various GLSL shader compilation warnings and errors that came up as a result of the above changes.
* Changed initial conditions for the "hardware skinning" checkbox on the preferences floater so it can be modified before login on machines that support avatar vertex programs.
* Removed unused avatarAlphaF.glsl files
Reviewed by davep
2011-05-10 14:34:36 -07:00
Brad Payne (Vir Linden)