summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.cpp
AgeCommit message (Collapse)Author
2011-04-04Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-03-14update to latest viewer-developmentOz Linden
2011-02-24MergeXiaohong Bao
2011-02-23Merge: Backed out changes for STORM-336 for merge due to complexity, will ↵Loren Shih
need to apply these manually.
2011-02-23Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-22SH-874 Better VBO usage hints, most notably don't use VBOs for occlusion ↵Dave Parks
queries if GL is set to not use VBOs for stream draw.
2011-02-15partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused ↵Xiaohong Bao
leaking.
2011-02-01SH-831 Fix for local lights option not disabling local lights.Dave Parks
2011-01-21SH-534 Fix for various bump map glitches.Dave Parks
2010-12-29Automated merge up from viewer-developmentLoren Shih
2010-12-27merge up to latest viewer-developmentOz Linden
2010-12-20SH-68 WIP adding debug switch for performance testingNyx (Neal Orman)
Adding functionality to a previously added debug switch. This will allow me to have UI, etc turned off and thus not impact framerates when testing for rendering features.
2010-12-20Remove unimplemented software updater option. Fix potential double start of ↵Andrew A. de Laix
updater service.
2010-12-09change updater settings from check box to drop down menu; add choice of ↵Andrew A. de Laix
whether to install automatically as well as download automatically (not actually implemented yet).
2010-12-04merge up to viewer-developmentOz Linden
2010-12-02MergeDave Parks
2010-12-02SH-373 Update glext.h, disable anti-aliasing on ATI when rendering deferred. ↵Dave Parks
Get rid of RenderUseFBO debug setting (only use FBO when rendering deferred). Use GL_ARB_framebuffer_objects instead of GL_EXT_...
2010-11-18Merge with viewer-developmentMark Palange (Mani)
2010-11-17Work on CHOP-135: Hooking up setting UpdaterServiceActive to functionality. ↵brad kittenbrink
Paired with Mani. Toggling the setting now calls LLUpdaterService::startChecking() and LLUpdaterService::stopChecking(), which enable and disable the service.
2010-11-05Merge latest lindenlab/viewer-development with mani_linden/viewer-development.brad kittenbrink
2010-11-05SH-410 Opaque Water Project version 2.0Loren Shih
First implementation with UI changes.
2010-11-01VWR-23666 Removed setting VersionChannelName. LLVersionInfo::resetChannel() ↵Mark Palange (Mani)
and unit tests. Reviewed by brad.
2010-10-29Fix for assert in pipeline on startup.Dave Parks
2010-10-21Fix for crash when toggling anisotropic filtering.Dave Parks
2010-10-21Fix for crash when toggling anisotropic filtering.Dave Parks
2010-10-20SH-157 Add "RenderLocalLights" to preferences and featuretable to replace ↵Dave Parks
old local lights on/off radio group.
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-10-12SH-157 Make RenderShaderLightingMaxLevel automatically reload shaders.Dave Parks
2010-08-26Added graphics preference setting for physics.Loren Shih
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-09-03CTS-237 WIP performance testing to validate ARC algorithmNyx (Neal Orman)
Another typo - was disabling the UI, whether the debug option was true or false simple copy/paste error.
2010-09-03CTS-237 WIP performance testing to validate new ARC algorithmNyx (Neal Orman)
Fixing a typo in my previous patch - want to use setRenderTypeMask instead of andRenderTypeMask. Deminimis change, no review
2010-09-03CTS-237 WIP test performance to validate new ARC algorithmNyx (Neal Orman)
minor cleanup and fixing the linux build.
2010-09-02CTS-237 WIP analyze performance of rendering system to evaluate accuracy of ARCNyx (Neal Orman)
Added a debug setting to allow for the automatic disabling of non-essential rendering. Code reviewed by Davep
2010-07-14mergeDave Parks
2010-06-28Porting VBO changes from davep/viewer-release.Dave Parks
Better usage of LLVertexBuffer::sEnableVBOs. Added RenderUseStreamVBO debug setting for controlling usage of VBOs for particles/avatars/etc.
2010-06-21Merge from ssh://hg.lindenlab.com/dessie/viewer-releaseLeyla Farazha
2010-06-21Merge from ssh://hg.lindenlab.com/dessie/viewer-releaseLeyla Farazha
2010-06-18EXT-5808 FIXED Added another context menu. Also Navigation Bar and ↵Andrew Polunin
Mini-Location bar are mutually exclusive now - Implemented context menu for Mini-Location bar (menu_topinfobar.xml) - Implemented function show_topinfobar_context_menu() (in llviewermenu.h) which displays context menu for Mini-Location bar. - Functions toggle_show_navigation_panel() and toggle_show_mini_location_panel() modified so that Navigation Bar and Mini-Location bar are mutually exclusive (when the former is visible the latter is hidden and vice versa). - Implemented method LLPanelTopInfoBar::onContextMenuItemClicked which handles \"landmark\" and \"copy\" Mini-Location bar context menu actions. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/607/ --HG-- branch : product-engine
2010-06-07Merge with render-pipelineDave Parks
2010-06-04merge from viewer-publicTofu Linden
2010-06-04merge from viewer-publicTofu Linden
2010-06-03EXT-5808 FIXED Mini-Location panel was added below Navigation BarAndrew Polunin
- Implemented class LLPanelTopInfoBar (llpaneltopinfobar.h, llpaneltopinfobar.cpp, panel_topinfo_bar.xml). Most of it's implementation is borrowed from LLLocationInputCtrl class. - Mini-Location panel is turned off by default. - Added top bar context menu option \"Show Mini-Location Panel\". - Mini-Location panel displays the same context menu as top bar. - Added code to initialize LLPanelTopInfoBar in llviewerwindow.cpp. - Added declaration of the widget in main_view.xml Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/464/ --HG-- branch : product-engine
2010-05-26EXT-7479 FIXED only bumpmaps of type Brightness or Darkness load on 2.0.2 ↵Tofu Linden
(205107)
2010-05-26EXT-7479 FIXED only bumpmaps of type Brightness or Darkness load on 2.0.2 ↵Tofu Linden
(205107)
2010-05-26EXT-7479 FIXED only bumpmaps of type Brightness or Darkness load on 2.0.2 ↵Tofu Linden
(205107) (transplanted from 372fb87d85f7d78c6ff285b4789bd868cb000c97)
2010-05-20merge from viewer-publicTofu Linden