summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 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-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
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-27Added license headers.Geenz
2013-06-27SH-4310/BUG-2810/MAINT-2794 Better status checking and error logging in ↵Monty Brandenberg
Mesh code. Pay correct attention to status codes coming back from services. Generate better and consistent error messages when problems arise. There's more to do in error handling, need a way to cleanly fail all request types, only have that for LOD at this point. Do better keeping the HTTP pipeline between the low and high water marks. This was made challenging because the outer most code couldn't really see what's going on internally (whose actions are delayed in a worker thread). More to do here, the debug-like requests don't honor limits, that will come later. Made retry counts available from llcorehttp which can be used by the throttle-anticipating logic to advance the count. It helps but it reinforces the coupling between viewer and server which I do not like.
2013-06-27Fix for down key presses not opening up the IME character selection window, ↵Geenz
and inadvertently being handled while marked text is selected.
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 vwr-dev-matGraham Madarasz (Graham)
2013-06-26Remove patch fileGraham Madarasz (Graham)
2013-06-26Added tag 3.6.1-release for changeset 75cf8e855ae1Oz Linden
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-25Merge vwr-dev-matGraham Linden
2013-06-25NORSPEC-288 remove unassertable asserts from restoring code to condition ↵Graham Linden
normals for this fix
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-25merge changes for NORSPEC-280Oz Linden
2013-06-25NORSPEC-288 WIP fixes the issue with normal gen, but may be a bigger perf ↵Graham Linden
hit than we want