summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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-06-28Merge with viewer-bear which was just merged with viewer-releasecallum_linden
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-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-27increment viewer version to 3.6.2Oz Linden
2013-06-27Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-27CHOP-959: Make settings.xml actually valid XML LLSD.Nat Goodspeed
UserLoginInfo block had <key>Value</key> without the required subsequent element to provide any actual value. This confused at least the Python LLSD reader.
2013-06-27CHOP-955, CHOP-957: Prioritize indra.util.llmanifest in same source repo.Nat Goodspeed
It seems that certain build hosts have an (obsolete? broken?) install of indra.util.llmanifest under the system Python. If we append the local repo indra/lib/python to sys.path, viewer_manifest.py pulls in the broken llmanifest. Prepend to sys.path instead to ensure we get the right one.
2013-06-27CHUI-817 FIX Revealing the "Conversations" window reveals hidden Nearby Chat ↵PavelK ProductEngine
window as well
2013-07-19CHUI-985 POSTPONED [CHUIBUG]User receives three friendship offer ↵maksymsproductengine
notifications simultaneously when he accept/decline friendship offer
2013-07-17CHUI-987 FIXED (Viewer crashes when you try drag and drop any object from ↵Mnikolenko ProductEngine
inventory onto avatar’s name in resident picker)
2013-07-16CHUI-978 FIXED Add Nearby chat history to the list of transcriptions if it ↵Mnikolenko ProductEngine
exists(to enable "Chat history" menu item for Nearby chat)
2013-07-10CHUI-984 FIX Clicking on voice icon no longer brings up voice volume sliderPavelK ProductEngine
2013-07-09CHUI-978 FIXED Load data from chat log file in separate thread to prevent ↵Mnikolenko ProductEngine
viewer freeze
2013-07-08CHUI-982 FIXED Clicking on conversation in conversation list to bring focus ↵maksymsproductengine
to conversation removes text entry prompt for chat bar
2013-07-02Pull merge lindenlab/viewer-releasemaksymsproductengine
2013-06-27CHOP-956: Add settings_install.xml to settings_files.xml.Nat Goodspeed
Also clarify comment for ELLPath in lldir.h: ELLPath int values are read from settings_files.xml.
2013-06-26Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-26MATBUG-194 Fix for crazy colors on projector shadows with NVIDIA OpenGL 3.3 ↵Dave Parks
implementations
2013-06-26Merge cleanup.Dave Parks
2013-06-26Automated merge with https://bitbucket.org/davep/viewer-release-iqa-1366Dave Parks
2013-06-26Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-26NORSPEC-290 Allow shader compiler to unroll loop in multiPointLightFDave Parks
2013-06-26CHUI-983 FIXED Call showHistory() after clicking toast as it was before. ↵Mnikolenko ProductEngine
Minor change in showHistory()
2013-06-26NORSPEC-29: use the MaxMaterialsPerTransaction simulator feature if availableOz Linden
2013-06-25MATBUG-78 Fix for alpha lighting falloff not matching opaque lighting ↵Dave Parks
falloff (again).
2013-06-25CHOP-957: Stop looking for, or parsing, Mac arguments.txt file.Nat Goodspeed
2013-06-25CHOP-957: Stop reading gridargs.dat in 'secondlife' wrapper script.Nat Goodspeed
However, for backwards compatibility, continue to recognize and discard --skip-gridargs switch.
2013-06-25merge changes for NORSPEC-280Oz Linden
2013-06-24CHOP-955, CHOP-957: Platform-specific switches files => settings_install.xml.Nat Goodspeed
Instead of generating viewer command-line switch overrides into the Windows shortcut, an arguments.txt file on Mac, or a gridargs.dat file on Linux, generate a platform-independent settings_install.xml file containing 'sourceid' key (if 'sourceid' found in TeamCity environment variables). All command-line override switches previously found in the aforementioned files have happily become moot.
2013-06-24MAINT-2800 revert changes to objectSkinV to make it match 3.6.0 code and not ↵Graham Madarasz (Graham)
slow down on ATI on Mac
2013-06-24merge changes for DRTVWR-326 3.6.1-beta1Oz Linden
2013-06-24NORSPEC-280 include fix to downsampleDepthRect shader making GL 3.3. drivers cryGraham Linden
2013-06-21Merge cleanup.Dave Parks
2013-06-21NORSPEC-280 Fix for shader compilation error on OpenGL 3.3Dave Parks
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-21Only render bounding boxes for volumes in info display.Dave Parks
2013-06-20NORSPEC-277 WIP backout old-school normal permutationGraham Linden
2013-06-20Try to track down some bad bounding boxes in particles.Dave Parks
2013-06-20MATBUG-204 Fix for crash in genVolumeBBoxesDave Parks
2013-06-20Merge cleanupDave Parks
2013-06-20NORSPEC-262 make drag and drop aware of editing context so that editing ↵Graham Linden
normal/spec textures causes application to the correct tex channel
2013-06-20CHUI-850 FIXED Unread notifications are lost after relog in certain ↵PavelK ProductEngine
circumstances
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks