c6ee98394e
merging in latest viewer-dev to mesh merge branch
2011-07-28 11:37:10 -04:00
cd923af21f
SH-2183 Fix for multi-threaded curl not playing nice with mesh upload.
2011-07-28 00:26:30 -05:00
1ba2176292
merge changes for storm-1474
2011-07-27 20:12:37 -04:00
c07f55e605
merging latest viewer-development to mesh merge candidate.
2011-07-25 18:26:14 -04:00
825fc273ee
merge fix for SH-2031
2011-07-25 14:38:02 -04:00
4c32fb0455
increment viewer version to 2.8.3
2011-07-25 10:58:48 -04:00
723d05e6df
Added tag 2.8.2-start for changeset 54bc7823ad4e
2011-07-25 10:58:11 -04:00
b8be8820ea
close head created by 54e071a92450
2011-07-25 09:49:58 -04:00
e072806525
merge changes for storm-1458
2011-07-25 09:48:57 -04:00
b26ff4b4ed
SH-2031 Fix for bad vertex shader/fragment shader varying usage.
2011-07-25 00:00:04 -05:00
0ebf271a58
merge
2011-07-24 16:19:55 -05:00
6465218f18
Go back to useful head
2011-07-24 16:18:39 -05:00
578e44d9b8
dummy check in to make hg happy
2011-07-24 15:55:44 -05:00
a5769e8126
terminating accidental merge
...
--HG--
branch : oops
2011-07-24 15:44:46 -05:00
0f86c26fa5
merge
2011-07-24 15:10:13 -05:00
6df418b7af
merge changes for storm-1526
2011-07-22 22:07:50 -04:00
26a9a6929c
SH-2031 Fix for sometimes deadlocking a curl thread.
2011-07-22 16:22:51 -05:00
7ac2307501
merge back release branch changes
2011-07-22 10:46:25 -04:00
d28e411af6
Automated merge with http://hg.secondlife.com/viewer-development
2011-07-22 10:01:42 -04:00
ebbadcf772
merge changes from snowstorm team review build
2011-07-22 09:06:42 -04:00
298bb68484
STORM-1474 FIXED Implement Show Last Search in viewer chrome
...
- Minimize the search floater on teleport
2011-07-22 15:22:59 +03:00
e4a8ef4ce2
SH-2031 Cleanup from threaded curl implementation (remove errors/loops on shutdown).
2011-07-22 02:33:55 -05:00
c337888553
SH-2031 Disable usage of glMapBuffer (again). Despite using MapBufferRange, this is still a source of frame stalls.
2011-07-22 01:07:48 -05:00
7b6afd1eba
SH-2031 Followup to curl threading work -- don't start and stop the thread on every request, use a signal (cuts time spent in Pump IO down from 1-2 ms to 0.1ms)
2011-07-21 23:33:23 -05:00
764a13a196
SH-2031 Don't do network I/O from the main thread in llcurl.
...
Reviewed by Kelly
2011-07-21 17:35:04 -05:00
ca5bd96bb0
merge
2011-07-21 16:26:52 -04:00
4311ee30ec
merge
2011-07-21 16:26:07 -04:00
c118ec2099
merge up changes for 2.8.0 release
2011-07-21 15:02:03 -04:00
65d82fe192
SH-2031 Fix for stall in "Cleanup"
2011-07-21 13:10:28 -05:00
d26356d7e1
merge changes for storm-1519
2011-07-21 09:32:10 -04:00
dcc57bbb0e
merge changes for eli2_viewer-development
2011-07-21 09:30:22 -04:00
91bc7e34cf
merge late beta fixes
2011-07-21 09:25:46 -04:00
09c18af318
merge changes for release tags
2011-07-21 09:25:08 -04:00
aaecc4c53c
SH-2020 Fix for avatar skin/eyes and trees being bright/black/busted underwater.
2011-07-21 00:42:48 -05:00
e52caca712
SH-2048 Fix for invisiprims infecting neighboring prims with their invisi-ness.
2011-07-20 23:50:44 -05:00
78f1bad0e6
SH-2021 Fix for black water at the horizon from occlusion culling madness.
2011-07-20 17:56:22 -05:00
26568d5c98
SH-1838 Add error handling for allocation of off screen render targets.
...
Reviewed by Leslie
2011-07-20 16:06:04 -05:00
cec8d8b3e6
FIX INTL-58 set25, light set4 translation for 6 languages
2011-07-20 13:56:21 -07:00
c567f0dcdd
Added tag DRTVWR-68_2.7.5-release, 2.7.5-release for changeset 6866d9df6efb
2011-07-20 16:43:32 -04:00
6d86a36b84
Re-indent teamcity service messages when scanning build logs to fix incredibuild formatting.
2011-07-20 11:48:57 -07:00
299615e9d6
Re-enable public build status indicators
2011-07-20 11:48:19 -07:00
0ddf718d92
still trying to fix channels
2011-07-20 13:48:46 -04:00
7d8ec74213
Switching channels to project viewer
2011-07-20 11:30:55 -04:00
11ddfa8bce
SH-2090 FIX - cherry pick from davep commit
2011-07-19 17:52:32 -04:00
76249c58f6
SH-2038 FIX -- [PUBLIC] Severe performance drop on MacBook Pros
...
EXP-997 FIX -- Significant FPS degradation in 2.8.0 Beta on Mac equipped ATI video card
* Disabled VBO's on mac to avoid stalls in renderer
* Placed valid data into the padding between triangles in the vertex buffer to remove uninitialized craziness
* Removed invalid rendering checks causing GL errors in debug mode
Reviewed by davep
2011-07-19 13:31:32 -07:00
f45747e524
merge changes for storm-1487
2011-07-19 15:45:31 -04:00
20e08f6aa7
merge changes for storm-1221
2011-07-19 15:45:15 -04:00
41890cfee8
merge changes for storm-1502
2011-07-19 15:44:19 -04:00
51f251b2d5
merge changes for storm-1503
2011-07-19 15:44:00 -04:00
181c34c984
merge changes for vwr-26066
2011-07-19 15:43:38 -04:00
Nyx (Neal Orman)