3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
0103cac1dd
Merge viewer-bear maint RC changes to get this build closer to the RC it will follow
2013-09-26 11:44:40 -07:00
bd0a8c7ee9
MAINT-3128 FIXED Advanced graphical settings are not changing when dragging "Quality and Speed" slider
2013-09-11 00:41:10 +03:00
980802e468
STORM-1552: detect, ignore, and delete invalid feature and gpu table files
2013-09-05 22:06:16 -04:00
c08b60ac6f
CHOP-959: Streamline processing for --graphicslevel switch.
...
Use map-to in cmd_line.xml to inform the command-line processor that the
target variable for --graphicslevel is RenderQualityPerformance.
That lets us eliminate clunky llappviewer.cpp switch from '0' to 0, etc.
Moreover, previous switch statement only accepted 0 - 3, whereas
LLFeatureManager::setGraphicsLevel() actually accepts 0 - 6. Introduce
LLFeatureManager::isValidGraphicsLevel() and use that to validate.
Replace switch statement in setGraphicsLevel() mapping int constants to string
literals with static vector of level names, using same data for mapping as for
validating level numbers.
2013-06-28 15:26:18 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
3c5ac77a92
For MAINT-2157 Codereview: DaveP
2013-02-07 09:02:51 -08:00
119ce81029
Merge viewer bear updates + merge fixes
2013-09-23 22:10:59 -07:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
3b94a2f8de
Properly handle unicode pathnames in llfeaturemanager under Windows.
2013-06-17 16:53:20 +02:00
91363ed5bf
Downloadable gpu/feature table support.
...
Backout changesets 22574/c36e39f86509 22769/922e34c3d661 22766/b729996184e5 by hand.
Change filename saved/downloaded to shortVersion instead of fullVersion.
Added "last modified" for proper cacheing of the downloaded files.
2013-06-14 00:43:35 -04:00
954ebaed84
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
2013-01-08 13:40:59 -06:00
716e2ea3b1
Pull and merge viewer-development
2012-12-12 10:58:47 -08:00
e1da5bda78
merge changes for DRTVWR-257
2012-12-05 18:18:16 -05:00
1f2b88803e
MAINT-1953 Run through viewer stats and update GPU table with missing entries and new expected OpenGL versions
2012-12-04 16:10:15 -06:00
e83700b56d
MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging people to update their drivers.
...
Reviewed by Simon
2012-11-30 17:03:12 -06:00
73d1b4f79c
MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in setGraphicsLevel
...
Reviewed by Simon
2012-11-26 13:22:25 -06:00
4aa818055e
MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in setGraphicsLevel
...
Reviewed by Simon
2012-11-26 13:22:25 -06:00
ccef9ab267
MAINT-2086 Separate GPU class from settings more completely to avoid GPU dependent behavior when manually adjusting detail slider.
2012-12-12 16:42:06 -06:00
fd3cbbaa27
MAINT-2090 Make gcc happy
2012-12-12 15:23:50 -06:00
e0bc069af2
MAINT-2090 Never enable lighting and shadows by default on OS X
2012-12-12 14:52:36 -06:00
b6f0921099
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
2012-09-06 19:02:39 -04:00
9611356556
MAINT-1491 Integration of statistically generated GPU table -- enable shadows by default where appropriate.
2012-08-28 13:52:14 -05:00
5494524b61
Update graphics defaults based on team vote
...
Used code in llfeaturetable instead of modifying goutable to reduce merge conflicts
Changed some geforce cards to openGL 4.2 to not get propted to update when already on latest driver.
2013-02-02 23:17:03 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
bab1c95df8
Increase max defaultable graphics level to mid-high for OSX
...
We don’t have deferred rendering enabled at this level, unlike LL
2013-01-21 15:43:51 -08:00
88f2332505
redisable defaulting of RenderCompressTextures on in some cases
2013-01-03 23:49:48 -08:00
cc44316aed
Merge LL 3.4.3,
...
Note: aligned some of our code with LL's, spcifically feature table, gpu table, texture fetching, and some rendering defaults behavior.
2012-12-18 00:36:35 -08:00
f5254d532b
MAINT-1262 Fix for crash when setting graphics to Low
2012-07-12 16:53:31 -05:00
cb24ec2e0d
merge LL 3.3.4 beta
...
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
513c1d9744
SH-795 Potential fix for crash after setting graphics detail to low.
2012-03-20 16:05:29 -05:00
db0761845d
disable use of texture compression in feature table, fixes FIRE-6792 and FIRE-6767
...
RenderCompressTextures will be set to disabled for all systems by default
RenderCompressTextures can be enabled in preferences -> graphics -> hardware should the user want it enabled
2012-06-30 10:30:31 -07:00
f2a9376865
Add file name into copyright info on growl files and disable logging growl messages on Linux
2012-06-30 09:08:47 -07:00
bddd3cbe9a
enable texture compression by default on systems with a nvidia card or has less than 480MB vid ram
2012-06-22 17:34:34 -07:00
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
83e69659e2
MAINT-708 Add checkbox to hardware settings for controlling texture compression. Default texture compression to on for cards with 512MB of VRAM or less, off otherwise.
2012-03-08 15:22:56 -06:00
a8a7f4d0f5
Correction to 26918 - Lets actually disable texture compression by default instead of enabeling it...
2012-03-14 07:58:47 -07:00
59a742505d
disable texture compression by deafult for all memory amounts, remove option from preference
2012-03-12 15:52:40 -07:00
ba95bbc8a3
MAINT-708 Add checkbox to hardware settings for controlling texture compression. (By DaveP)
...
Default texture compression to on for cards with 512MB of VRAM or less, off otherwise.
2012-03-08 23:13:29 -08:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
f5b10238af
SH-2240 Forcibly disable shaders on hardware that's specifically flagged as unsupported.
2011-10-24 13:10:26 -05:00
1762cc4939
SH-2570 Don't minimize viewer when reloading shaders (revert hack that didn't work) and pause shader loading until after all feature masks have been applied when switching detail levels
2011-10-20 14:20:12 -05:00
25f1653ca0
EXP-1080 FIX Console gets spammed with VertexShaderEnable messages making the viewer unusable
...
converted LL_WARNS to LL_WARNS_ONCE
2011-08-11 14:21:20 -07:00
f1443579b3
SH-2038 Potential fix for a myriad of performance problems concering VBO usage.
2011-07-09 02:28:34 -05:00
303a59e7bc
dos2unix fixes for newview files.
2011-05-26 14:16:56 -04:00
781addcbc1
Automated merge up from viewer-development into mesh-development
2011-05-20 11:41:28 -04:00
19a06478d9
SH-1618 FIX -- Lighting and shadows crash ATI macs
...
* Fixed ATI mac "lighting and shadows" related crash
* Fixed up numerous GL errors on macs related to multiple color formats,
the use of glEnable/glDisable on textures above the texture unit count
and old ATI-specific code that was not appropriate for Mac.
* Disabled SSAO for ATI macs due to it not working with shadows
* Ongoing work to properly get shadows and SSAO functioning on ATI macs is required.
Reviewed by davep
2011-05-19 17:28:23 -07:00
5eb6cb8d86
merge up latest viewer-development (post mesh)
2011-05-18 07:33:08 -04:00
Tank_Master