938ad0c640
NORSPEC-305 -NORSPEC-335 fix scale and HUD anim regression from materials changes in CL 28424
2013-08-04 05:21:34 -07:00
9557926fff
NORSPEC-332 fix fullbright tex indexing fail
2013-08-03 08:25:03 -07:00
14c7108ca3
NORSPEC-304 NORSPEC-334 NORSPEC-336 fix black glow overdraw without breaking glow
2013-08-03 06:52:56 -07:00
acda43ed38
CHOP-959: merge --graphicslevel fix up to tip
2013-08-02 10:51:11 -04:00
32a953f65e
CHOP-959: Honor --graphicslevel switch even on first viewer run.
...
Previous CHOP-959 logic set a flag to remember that settings variable
RenderQualityPerformance was set (by --graphicslevel), so it could be applied
once LLViewerWindow is constructed. But on first viewer run, LLViewerWindow
constructor calls LLFeatureManager::applyRecommendedSettings(), which resets
that settings variable! So don't just set a flag, actually capture the
requested RenderQualityPerformance value for later.
2013-08-02 10:50:19 -04:00
ee25146ce4
Merge downstream code
2013-08-01 16:19:49 -07:00
9f60fc46e2
Merge
2013-08-01 16:18:39 -07:00
2d065562f1
NORSPEC-336 fix glow regression from 304 fix
2013-08-01 14:01:37 -07:00
570884d730
MAINT-2958 : "Mute Particle Owner" should be "Block Particle Owner"
2013-08-01 12:46:14 -07:00
440e576f86
MAINT-2949 : Objects across the sim border do not render when approached. Added
...
missing code block from previous change as per Dave P's advice
2013-08-01 11:38:17 -07:00
4a3c99beb2
NORSPEC-304 fix glow pass rendering over alpha pass after ALM toggle
2013-08-01 10:34:36 -07:00
daa98bf1cf
Merge downstream code
2013-07-30 15:22:00 -07:00
6db14e3988
MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexes
...
bullet-proof. Reviewed by Kelly
2013-07-30 15:12:02 -07:00
42ce98e8bf
NORSPEC-314 cleanup debug-only code...seems to fix NORSPEC-328 as well somehow
2013-07-30 13:44:12 -07:00
c1b3f363cc
Merge vwr-dev-mat
2013-07-30 12:05:53 -07:00
f86a7c04d3
NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac 10.6.8 nV driver issues
2013-07-30 11:33:58 -07:00
152d76e13e
MAINT-2939 FIXED [CHUI] On Windows machine location address bar in viewer goes blank if location is selected and a menu item is seleted
2013-07-30 20:03:21 +03:00
344c42cc3f
Adding a non-code change to force a rebuild of the CHUI RC to avoid CHOP-100
2013-07-30 15:17:02 +00:00
f48fedf84e
Slowest debug in the west.
2013-07-29 21:45:51 -07:00
8f5e2cd839
I love issues that only reproduce via teamcity
2013-07-29 19:16:00 -07:00
b44e7303d8
NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on Mac
2013-07-29 18:59:45 -07:00
be89f2f8fb
NORSPEC-314 fixed another mac-specific stupidity by splitting out a new srgb_mac version of the shader
2013-07-28 18:29:51 -07:00
c5fc5d9b46
NORSPEC-323 fix norm/tangent gen for prim caps
2013-07-28 15:43:10 -07:00
d7edd0cfd8
Merge vwr-dev-mat
2013-07-28 14:28:46 -07:00
0f5dbc1935
NORSPEC-314 fix the fullbright alpha mask logic
2013-07-28 14:03:56 -07:00
50be9d611e
NORSPEC-327 modify 'select' ops in srgb shader code to mollify the doddering mac GLSL compiler
2013-07-26 12:44:05 -07:00
73703191e0
NORSPEC-327 modify 'select' ops in srgb shader code to mollify the doddering mac GLSL compiler
2013-07-26 12:44:05 -07:00
0906d000b3
CHOP-955: merge viewer_manifest.py file_list fix
2013-07-26 10:42:58 -04:00
a207b24d33
CHOP-955: Include app_settings/settings_install.xml in file_list.
...
viewer_manifest.py uses its base-class llmanifest.LLManifest.put_in_file()
method to create several different files in the install image being
marshalled. I based the logic to create settings_install.xml on that example.
Unfortunately I failed to notice that after every existing call, the script
also explicitly appended the newly-created file to self.file_list... which
only matters on Windows. file_list is fed to the NSIS installer.
Change put_in_file() method to implicitly append to self.file_list.
Change every existing viewer_manifest.py call to pass new put_in_file(src=)
param instead of explicitly appending to self.file_list.
2013-07-26 10:42:13 -04:00
1bcce503a9
Automated merge with ssh://hg.lindenlab.com/nat/viewer-chop-951
2013-07-26 09:00:01 -04:00
f7cdbb2582
CHOP-962: merge code-review fixes with viewer-release
2013-07-26 08:59:37 -04:00
c109361861
CHOP-962: per code review, comment that other code relies on "Global".
...
The comment advises grepping for "Global" rather than specifically pointing to
llcontrol.cpp because that's NOT the only place that relies on the name
"Global"! Besides, by the time someone does want to change the name, still
other such dependencies could've crept in.
2013-07-26 08:58:47 -04:00
d2386652f8
CHOP-962: Make LLControlVariable::setPersist() accept only enum.
...
Initial change made LLControlVariable::mPersist an enum, but retained
bool/BOOL public API. setPersist(true) set one value, setPersist(false) set
another, forcePersist() set the third. Per code review, expose enum to public,
make setPersist() (and LLControlVariable constructor, and LLControlGroup::
declareControl(), and all the LLControlGroup::declareMumble() methods, and all
the unit-test dummy declareMumble() method bodies) accept that enum. Remove
forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly.
Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
2013-07-25 16:46:51 -04:00
7530e801f4
Kill all the vivox logs
2013-07-25 13:42:36 -07:00
3045dd6c51
Make use of vertex_color selectable per shader with alphaF/alphaV again
2013-07-25 12:13:21 -07:00
6d21cd2ae1
NORSPEC-324 set gamma value for avatar alpha shader too for gamma correct eyelashes
2013-07-25 11:09:45 -07:00
f357269c38
NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB conversion in one place
2013-07-25 09:36:13 -07:00
24cef8d36b
NORSPEC-326 eliminate identity theft causing mac nV mobile shader compilation fail
2013-07-24 17:43:56 -07:00
e21ab706b9
NORSPEC-324 when using display_gamma, actually set display_gamma
2013-07-24 15:43:38 -07:00
10c8fbbedb
added default sourceid and check that sourceid is not blank, hoping to get the windows builds to recognize the value
2013-07-24 14:38:23 -07:00
e681d19ea6
MATBUG-306 regression fix, vert color applied in wrong colorspace
2013-07-24 12:17:39 -07:00
9f393c1d99
merge up to latest snowstorm integration branch
2013-07-24 14:40:23 -04:00
d6b4124fb9
NORSPEC-311 WIP move to per-pixel alpha lighting and make spot/point calcs match more closely
2013-07-24 11:21:40 -07:00
7e2c4cd91d
NORSPEC-314 fix discrepancies between alpha and non-alpha deferred point/spot atten
2013-07-24 08:26:28 -07:00
4854444e24
MATBUG-315 remove unused uniforms from depth downsample frag shaders as they anger some shader compilers despite not being used
2013-07-24 06:11:22 -07:00
e290dd3fa1
NORSPEC-311 make post deferred (alpha objects) respect same gamma ramp as deferred (opaque objects)
2013-07-24 04:03:27 -07:00
72a0ae58e9
NORSPEC-293 fix sRGB to linear conversion to not scrooge the darks
2013-07-23 16:09:58 -07:00
96869baaef
NORSPEC-285 NORSPEC-298 alpha vs diff color differences
2013-07-23 14:28:52 -07:00
b411179bd0
NORSPEC-314 make work-around apply to all Macs for now
2013-07-23 13:48:57 -07:00
18c7ef3276
Fix regression causing fullbright alpha-masked objects to be opaque
2013-07-23 11:36:25 -07:00
Graham Linden