Dave Parks
2ac1fe03e8
SH-1838 Fix for black screen when enabling lighting and shadows on an ATI machine.
2011-06-21 16:11:04 -05:00
Xiaohong Bao
fe1f59b8b8
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2011-06-21 11:08:20 -06:00
Xiaohong Bao
24749ecef9
fix for SH-1650: [PUBLIC_JIRA_USERS] Widespread crash-to-desktop via llvertexbuffer.cpp(1005) - "memory allocation for vertex data failed" or Render Pool 15
2011-06-21 11:00:53 -06:00
Dave Parks
d4103101fe
SH-208 Disable VBO on all intel graphics chips (stability improvement).
2011-06-21 11:17:44 -05:00
Aaron Stone
83b4eb2201
SH-1618 isFullbright causes AvatarEyes GL shader to fail to link.
2011-06-20 16:42:31 -07:00
Dave Parks
b9b1500979
SH-1618 Fix for shaders being disabled on mac due to switch statement in indexed texture rendering code.
2011-06-20 11:55:22 -05:00
Dave Parks
7650bc6887
merge
2011-06-20 10:34:12 -05:00
Oz Linden
7f6d49df43
fix DOS line endings
2011-06-17 17:38:24 -04:00
Oz Linden
3444d77609
merge changes for storm-1388
2011-06-17 17:34:27 -04:00
Oz Linden
068c6d4509
merge mesh branch changes (storm-1390)
2011-06-17 17:32:28 -04:00
Oz Linden
5e5be51ede
storm-1389
2011-06-17 17:30:58 -04:00
eli_linden
34674d935b
FIX VWR-25070
2011-06-17 11:40:48 -07:00
eli_linden
6575258ff9
FIX VWR-25068 en_xui_change
2011-06-17 11:39:56 -07:00
eli_linden
c4d37c3cae
WIP INTL-46 Traditional Chinese translation update 6/17
2011-06-17 11:34:11 -07:00
Logan Dethrow
796624d947
STORM-1320 OPEN-21 STORM-312 Update libndofdev on linux. Fixes spacenavigator.
2011-06-17 13:07:14 -04:00
Xiaohong Bao
e63f6311be
fix for STORM-1274: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138
2011-06-16 15:55:22 -06:00
Brad Payne (Vir Linden)
806b11c572
merge
2011-06-16 17:53:14 -04:00
Brad Payne (Vir Linden)
6c5ae7f6ab
Fix for linux build failure, hopefully
2011-06-16 17:00:12 -04:00
Brad Payne (Vir Linden)
8114464a72
merge
2011-06-16 15:58:55 -04:00
Brad Payne (Vir Linden)
cc6e804129
SH-1166 FIX
2011-06-16 15:58:34 -04:00
eli_linden
9d0351550e
sync with viewer-development
2011-06-16 12:32:30 -07:00
prep linden
9d9d9197a0
merge
2011-06-16 15:24:14 -04:00
prep linden
6d436f152b
Fix for camera wonkiness (sh-1654 ...)
2011-06-16 15:23:49 -04:00
Brad Payne (Vir Linden)
6532d5db2d
SH-1166 WIP
2011-06-15 18:38:30 -04:00
Xiaohong Bao
47b9f588df
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-15 16:28:12 -06:00
Xiaohong Bao
0bb7bcc96c
fix for SH-1788: Assert in texture load when uploading textured mesh model
...
and beyond: fixed the thread-safe and highest texture resolution flaws in the mesh texture uploading flow.
2011-06-15 16:20:33 -06:00
Brad Payne (Vir Linden)
8e532652eb
merge
2011-06-15 17:08:55 -04:00
Brad Payne (Vir Linden)
b07f51b4c7
SH-1773 FIX
2011-06-15 16:55:26 -04:00
Oz Linden
ba797281f0
storm-1347
2011-06-15 15:10:14 -04:00
eli_linden
cd51c7e01a
FIX INTL-50 DE translation for Set24 and Basic Set3
2011-06-15 11:29:55 -07:00
prep linden
1b3f3fa7a6
Fix for sh-1771 and also fixed a bug with a never ending load (with eventual crash) bug when a visual scene is missing.
2011-06-15 13:26:14 -04:00
Oz Linden
f0694e45c8
merge changes for storm-1298
2011-06-15 12:04:09 -04:00
Oz Linden
b779112256
merge changes for storm-1339
2011-06-15 12:03:45 -04:00
Oz Linden
624b050589
merge changes for storm-1103
2011-06-15 11:58:50 -04:00
Oz Linden
26e1f92c83
merge changes for storm-1313
2011-06-15 11:58:01 -04:00
Oz Linden
81afbd5b29
merge changes for storm-787
2011-06-15 11:57:13 -04:00
Oz Linden
83cb59e45b
merge changes for storm-899
2011-06-15 11:56:18 -04:00
Oz Linden
b6e69570dc
merge changes for storm-1273
2011-06-15 11:55:12 -04:00
Oz Linden
ee904d38ff
correct execute bit on gpu_table_tester script
2011-06-15 11:54:32 -04:00
Vadim ProductEngine
5506dca9b9
STORM-1339 FIXED Making a preventive fix for a crash in LLPanelPlaces::onTeleportButtonClicked().
2011-06-15 18:39:10 +03:00
Dave Parks
a451c9e834
merge
2011-06-14 18:21:52 -05:00
Dave Parks
1fbb85a7cb
SH-680 Adjust streaming cost scaler to agree with simulator.
2011-06-14 18:21:21 -05:00
Oz Linden
735c0dbc5f
merge changes for storm-1342
2011-06-14 15:54:03 -04:00
eli_linden
155cda7e82
WIP CT-648 DA translation for Set24, Basic Set3
2011-06-14 12:33:41 -07:00
eli_linden
9899e2e7dd
FIX CT-641 DA translation for Set23
2011-06-14 12:28:05 -07:00
eli_linden
51d6870572
FIX CT-637 DA translation for Basic Set2
2011-06-14 12:24:32 -07:00
Oz Linden
d0a4513271
merge changes for storm-1338
2011-06-14 15:21:28 -04:00
eli_linden
b4bf02ae50
WIP INTL-46 Traditional Chinese translation update
2011-06-14 12:17:10 -07:00
jenn
8b1f9529dd
Enabling watchdog timer with timeout of 20.
...
This is in support of a Viewer crash pile-on. It is intended to ship to Beta, then either be reverted or have an increased timeout prior to shipping to release.
2011-06-14 15:24:48 +00:00
Brad Payne (Vir Linden)
cc97e3d5ca
merge
2011-06-14 10:14:44 -04:00