ae7d475aeb
SH-2794, resolved merge conflict and corrected logic in LLVertexBuffer::determineUsage() to work the way it used to.
2012-02-06 12:43:23 -08:00
344c46a20c
merge, conflicts in llvertexbuffer.{h,cpp}
2012-02-06 15:08:41 -05:00
d0da897b24
tag merge back from viewer-beta
2012-02-06 14:48:09 -05:00
836e5e56ee
Added tag DRTVWR-115_3.2.8-beta2, 3.2.8-beta2 for changeset 987425b1acf4
2012-02-06 14:43:32 -05:00
289d756ea8
increment viewer version to 3.3.0
2012-02-06 10:01:09 -05:00
54bc900c95
Added tag 3.2.9-start for changeset 37dd400ad721
2012-02-06 10:00:15 -05:00
5e74293b0c
fix for SH-2941: crash at LLCurl::Easy::~Easy()
2012-02-03 22:01:46 -07:00
099ce3cbde
merge changes for vmrg-222
2012-02-03 18:35:46 -05:00
a89fbc1d33
EXP-1868 FIX Remove Merchant Outbox from Me menu
...
removed merchant outbox context menu
reviewed by Leslie
2012-02-03 11:14:54 -08:00
a3a69b1eb1
Added tag DRTVWR-114_3.2.8-beta1, 3.2.8-beta1 for changeset 16f8e2915f3f
2012-02-03 14:01:03 -05:00
028d9b3b34
EXP-1868 FIX Remove Merchant Outbox from Me menu
...
reviewed by Leslie
2012-02-03 10:45:14 -08:00
36aba26615
EXP-1843 WIP Added an option to output avatar rez timing.
...
Use the new "Avatar Rez" debugging tag to see the output.
2012-02-03 11:10:13 +02:00
34408bed26
merge
2012-02-01 15:43:11 -05:00
127f6d1405
Fixed up LLVolume memory leak caused by mesh repo thread.
...
Reviewed by Bao.
2012-01-31 16:36:25 -08:00
de26be1ba2
SH-2592 FIX -- (OS X Lion) Graphics issues with Atmospheric Shaders enabled on Intel HD 3000, 10.7.2
...
This is a dummy check-in to get the previous commit associated with SH-2592 instead of EXP-2592, which was a typo.
2012-01-31 09:58:37 -08:00
a39937f930
merge
2012-01-30 22:27:01 -05:00
1ff55f2934
EXP-2592 FIX -- (OS X Lion) Graphics issues with Atmospheric Shaders enabled on Intel HD 3000, 10.7.2
...
* Fixed up shaders to add haze_density and blue_density together correctly as vec4's rather than
relying on the shader compiler to add them together properly.
2012-01-30 16:44:01 -08:00
fd56967dea
Merge with latest
2012-01-30 15:54:39 -08:00
c4084c7138
SH-2592 PROGRESS -- (OS X Lion) Graphics issues with Atmospheric Shaders enabled on Intel HD 3000, 10.7.2
...
Refactored WindLight estate settings to use float uniforms in the shaders that
only need it, rather than vec4's for everything.
2012-01-30 15:29:53 -08:00
0e609cc95b
increment viewer version to 3.2.9
2012-01-30 16:45:50 -05:00
bd4c629e38
Added tag 3.2.8-start for changeset 89980333c99d
2012-01-30 16:44:58 -05:00
1ed8faee81
merge changes for vmrg-219
2012-01-30 15:48:44 -05:00
5697391219
merge
2012-01-30 10:15:08 -05:00
dee66ccb3a
merge
2012-01-27 14:59:18 -06:00
c1b14fb7bf
SH-2646 Fix for shiny HUD objects not being fullbright
2012-01-27 14:58:51 -06:00
3bebf4af31
merge
2012-01-27 13:56:33 -05:00
cd46f4a7b9
SH-2684 FIX, SH-2716 FIX - bug was specific to running in non-english language
2012-01-27 13:56:03 -05:00
e0a62d8941
SH-2768 Put transparency checkerboard back in texture preview
2012-01-27 12:41:18 -06:00
17b21fc197
Fix for windows build
2012-01-26 12:50:24 -06:00
71a660e006
* Fixed up shader compilation errors to get lighting and shadows working again on Mac.
...
* Cleaned up vertex buffer allocation to guarantee allocation and deallocation using the same allocation methods from the same pools.
* Added new shader feature for atmospheric helpers in the absence of lighting.
Reviewed by davep.
2012-01-26 10:17:41 -08:00
041aaf8ea9
* Removed old, unused RenderNightBrightness from feature table.
...
Reviewed by davep.
2012-01-26 10:12:10 -08:00
717a6f3306
Introduce two new parameters "CurlUseMultipleThreads" and "CurlRequestTimeOut" for QA to test Curl.
2012-01-25 18:27:40 -07:00
cc3f90a888
Automated merge with https://bitbucket.org/VirLinden/vir-project-3
2012-01-25 16:30:02 -07:00
1316f33130
fix for SH-2904: textures remain stuck in HTP state
2012-01-25 16:01:56 -07:00
0bbe8d73cb
SH-2565 Move resetVertexBuffer operation to a consistent location (also avoid redundant resetting of vertex buffers on detail switches). Change assertion to a warning with count info. Fix bytes pooled debug display. Remove unused static vertex buffer.
2012-01-25 15:37:36 -06:00
63398cd531
SH-2791 Use request class constructor/destructor for keeping track of concurrent requests instead of unreliable increments/decrements sprinkled around the code.
2012-01-24 17:37:20 -06:00
9bbaf3ab14
merge
2012-01-30 10:23:06 -05:00
9e621af3db
SH-2791 Use request class constructor/destructor for keeping track of concurrent requests instead of unreliable increments/decrements sprinkled around the code.
2012-01-24 17:37:20 -06:00
4ef9277761
merge changes for vmrg-218
2012-01-24 16:22:23 -05:00
b2f77bee7e
merge changes for vmrg-217
2012-01-24 16:21:34 -05:00
a2544b18e8
merge
2012-01-24 14:51:47 -05:00
371534167e
merge
2012-01-24 12:59:40 -06:00
e02f007d20
SH-1427 Fix for spot lights not working properly on alpha objects, and fix for alpha lighting of point lights not matching deferred lights.
2012-01-24 12:59:18 -06:00
361efbc07e
merge
2012-01-24 11:03:22 -05:00
ea6cbc7b6b
Reverting background fetch on an item to the old fetFromServer call to fix regression bug in inventory late loading
2012-01-23 15:55:36 -08:00
83ca425158
Reverting rev 22217 changes to background fetch so search and recent will fully fetch user inventory
2012-01-23 15:34:01 -08:00
ca9f000289
* Optimization to not waste some time doing std::string assignment all over the graphics code.
...
Reviewed by davep.
2012-01-23 13:40:20 -08:00
e2d4309ba5
EXP-1799 FIX -- Replace and Add to Outfit options and Copy to Merchant Outbox options can appear in invalid state when a valid folder is last selection
...
EXP-1834 FIX -- Right click context menus on Folders in Merchant Outbox and Library folders can show all inventory options including admin options
EXP-1835 FIX -- Right clicking on a folder and selecting New Folder creates folder under My Inventory not within selected folder
* Updated folder context menu building to build full options in one step or
trigger a load which will rebuild top-level context menu for all selected
items when complete. Previous code had an implicit assumption that the
selected folder was the only selection after background fetch.
2012-01-23 11:45:47 -08:00
e377182c04
merge changes for storm-1799
2012-01-23 14:17:21 -05:00
04452c96e1
merge changes for storm-1798
2012-01-23 14:16:29 -05:00
Leslie Linden