summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-07-03Merge vwr-dev-matGraham Linden
2013-07-03NORSPEC-295 make a deferred path version of fullbright alpha mask shader so ↵Graham Linden
we can included gamma ops
2013-07-03Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-07-03remove command line option that causes warning messagesOz Linden
2013-07-02NORSPEC-293 nix gamma correction in fullbrightF causing this visual disparityGraham Linden
2013-07-02Mergesimon
2013-07-02MAINT-2808 Viewer side : Stats for OBJECT_ATTACHMENT_GEOMETRY_BYTES and ↵simon
OBJECT_ATTACHMENT_SURFACE_AREA do not return to the 'no attachments' values after avatar removes last attachment
2013-07-02NORSPEC-287 Make alpha sRGB correction curves match OpenGL spec.Dave Parks
2013-07-02merge changes for latest integration changesOz Linden
2013-07-02fix bug reading RenderMaterialsCapability, improve logging for NORSPEC-206Oz Linden
2013-07-02Merge vwr-dev-matGraham Linden
2013-07-02CHOP-959: Merge region-local location change with tip.Nat Goodspeed
2013-07-02CHOP-959: Introduce CmdLineChannel settings var, map --channel to it.Nat Goodspeed
2013-07-02Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-07-02NORSPEC-290 Disable occlusion culling for distortion render target since ↵Dave Parks
there are generally zero under water occluders.
2013-07-02NORSPEC-292 remove unnecessary call to setIsLightGraham Linden
2013-07-02NORSPEC-292 fix issues with managing LLNetworkData::PARAMS_LIGHT_IMAGE when ↵Graham Linden
demoting spotlights by removing their tex
2013-07-02CHOP-959: Introduce CmdLineLoginLocation var for --url and --slurl.Nat Goodspeed
Route --url and --slurl command-line switches through a common settings variable. Treat them uniformly now. (Previously, passing --url would notice a grid-specific SLURL and preselect that grid; --slurl wouldn't. Now both do.)
2013-07-02MAINT-528 added syntax highlighting for STATUS_BLOCK_GRAB_OBJECT and ↵Maestro Linden
corrected related tooltips
2013-07-02MAINT-1312 Fixed a typo in PRIM_TEMP_ON_REZ tooltip. Reviewed by Kelly.Maestro Linden
2013-07-02MAINT-1260 add missing PRIM_ constants to syntax highlighting. Reviewed by ↵Maestro Linden
Kelly.
2013-07-02merge changes for storm-1953Oz Linden
2013-07-02merge changes for STORM-1948Oz Linden
2013-07-02NORSPEC-296 make add_media button always available as long as the face is ↵Graham Linden
editable
2013-07-02NORSPEC-296 make add_media button always available as long as the face is ↵Graham Linden
editable
2013-07-02CHOP-959: Report region-local position in Help -> About box.Nat Goodspeed
I've never really understood the usefulness of displaying world-global coordinates in the Help -> About box. It seems to me far more useful to know where you are within the current region. If that proves problematic, we can display both sets of coordinates -- but let's try it this way first.
2013-07-02CHOP-959: add POSITION_LOCAL to LLFloaterAbout::getInfo() blob.Nat Goodspeed
The existing POSITION variable gives "global" position: that is, your region- local coordinates plus the (somewhat arbitrary) global coordinates of the region's corner within the whole world. That may be meaningful to people on the mainland, hard to say, but it correlates with nothing else available from the viewer. POSITION_LOCAL gives you region-local coordinates, which could be used (for instance) to construct a SLURL.
2013-07-01NORSPEC-290 Shader optimization WIP -- compatibility pass with OpenGL 3.3, ↵Dave Parks
slight cleanup.
2013-07-01CHOP-959: Introduce and use settings vars for some cmd_line switches.Nat Goodspeed
The cmd_line.xml entries: analyzeperformance crashonstartup debugsession disablecrashlogger logmetrics logperformance noquicktime replaysession all specify map-to settings.xml variables -- none of which existed! Introduce such variables. Instead of detecting the presence of a particular switch in the command-line parser, use the value of its corresponding settings variable.
2013-07-01Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-07-01NORSPEC-290 Shader optimization WIP -- remove some more divides and ↵Dave Parks
normalizes from various lighting functions, rework flow control based on profile feedback.
2013-07-01merge changes for latest project integration repoOz Linden
2013-06-29MAINT-2302: Make llprocess test<6> output less like a build error.Nat Goodspeed
build.sh LogScan greps for "error:" (among other things) so removing the colon from the test name "syntax_error" should help.
2013-06-29MAINT-2302: Re-enable previously-disabled LLProcess tests for diagnosis.Nat Goodspeed
2013-06-29Orphaned declaration preventing compilation.Monty Brandenberg
2013-06-28SH-4312 Clumsy configuration coordination between mesh and corehttpMonty Brandenberg
Taught llappcorehttp to register signals on the settings values that chagne behavior. Have initialization and settings changes sweep through settings and change them. Dynamic changes are tried but have no effect (produce a warning message) as dynamic settings still aren't supported but the plumbing is now connected. Just need to change llcorehttp. Bounced the 'teleport started' signal around and it ended up back where it started with some cleanup. This is making me less angry...
2013-06-28SH-4257 Prepare for new 'GetMesh2' capability.Monty Brandenberg
Needed to move the cap from response to region instance.
2013-06-28Merge with viewer-bear which was just merged with viewer-releasecallum_linden
2013-06-28merge changes for latest project integration repoOz Linden
2013-06-28move reading of the sim features to LLViewerRegion for consistency, a couple ↵Oz Linden
of minor cleanups
2013-06-28CHOP-959: Streamline processing for --graphicslevel switch.Nat Goodspeed
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-28NORSPEC-290 Shader optimization WIP -- remove a couple normalizes, pows, and ↵Dave Parks
divides from various lighting functions.
2013-06-28NORSPEC-206: read RenderMaterialsCapability throttle rate per second from ↵Oz Linden
simulator
2013-06-28merge changes for 3.6.1-releaseOz Linden
2013-06-27Merged lindenlab/viewer-release into defaultCinder Roxley
2013-06-27Merged lindenlab/viewer-release into defaultCinder Roxley
2013-06-27Merge with viewer-releasecallum_linden
2013-06-27SH-4311 Get highwater limiting of requests into llhttpcore working.Monty Brandenberg
Fixed the logic and have it covering all five types of requests now with validation via an assert (when enabled). Should keep things working smoothly and avoid floods of 503s when in debug modes. Also started a round of file-level documentation detailing thread usage and mutex coverage. More to do, more to describe. But the high- water stuff is functioning correctly.
2013-06-27merge changes for 3.6.1-releaseOz Linden
2013-06-27increment viewer version to 3.6.2Oz Linden