summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-07-30Merge downstream codesimon
2013-07-30MAINT-2913: crash in LLCamera::AABBInFrustum. Tried to make array indexessimon
bullet-proof. Reviewed by Kelly
2013-07-30NORSPEC-314 cleanup debug-only code...seems to fix NORSPEC-328 as well somehowGraham Linden
2013-07-30merge changes for CHOP-975Oz Linden
2013-07-30ACME-757 : Change the hard coded url to fbc service (still a hack)Merov Linden
2013-07-30SH-4371 Reduce 22mS inter-connection latency.Monty Brandenberg
This really extended into the client-side request throttling. Moved this from llmeshrepository (which doesn't really want to do connection management) into llcorehttp. It's now a class option with configurable rate. This still isn't the right thing to do as it creates coupling between viewer and services. When we get to pipelining, this notion becomes invalid.
2013-07-30Merge vwr-dev-matGraham Madarasz (Graham Linden)
2013-07-30NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac ↵Graham Madarasz (Graham Linden)
10.6.8 nV driver issues
2013-07-30MAINT-2939 FIXED [CHUI] On Windows machine location address bar in viewer ↵maksymsproductengine
goes blank if location is selected and a menu item is seleted
2013-07-30CHOP-975: Remove fallback to v1.0 update query when the v1.1 gets a 404 responseOz Linden
2013-07-30get rid of warning generated by trying to save obsolete VersionChannelName ↵Oz Linden
setting
2013-07-30Adding a non-code change to force a rebuild of the CHUI RC to avoid CHOP-100Steven Harrison (steven)
2013-07-29Slowest debug in the west.Aura Linden
2013-07-29I love issues that only reproduce via teamcityAura Linden
2013-07-29NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on MacGraham Madarasz (Graham Linden)
2013-07-29Reduce HTTP request retry log spam. Thought I'd done this in anMonty Brandenberg
earlier maintenance branch but the code never showed up. I'll do it again. Spam is still available by bumping 'CoreHttp' tag up to DEBUGS level logging. Needed for QA. Can also get this data from tracing.
2013-07-29SH-4371 Reduce 22mS inter-conenction latency on HTTP operations.Monty Brandenberg
Simple change dropped this value by 7-10mS or so. Any time we complete an operation on a transport pass, arrange to skip the run-loop sleep so that we fill a possible empty slot as quickly as possible. With pipelining, this kind of thing should become unnecessary but for now, we'll do this to increase throughput.
2013-07-29merge changes for maint-2936Oz Linden
2013-07-29merge changes for storm-1838Oz Linden
2013-07-29Add copyright and licenseJeff (Gioffredo Linden)
2013-07-29ACME-755 : Fix erasing in live std::map (breaks build on Mac and Linux).Merov Linden
2013-07-29merge storm-1958Oz Linden
2013-07-29add credit for storm-1958Oz Linden
2013-07-29STORM-1838 mergeJonathan Yap
2013-07-29STORM-1838 Add display name handling to the initial notificationJonathan Yap
2013-07-29SH-4368 Adjust upload timeout parameters for slow networks.Monty Brandenberg
Generally sorted the mesh timeout parameters for maximum transport time (staying with default 30 for connect). 60S for normal meshes, 600S for large. Also documented default option values in httpoptions.h. Useful to have these. In the future, the timeouts might go into standard llsd options where they can be tracked a bit more.
2013-07-28NORSPEC-314 fixed another mac-specific stupidity by splitting out a new ↵Graham Madarasz
srgb_mac version of the shader
2013-07-28NORSPEC-323 fix norm/tangent gen for prim capsGraham Linden
2013-07-28Merge vwr-dev-matGraham Linden
2013-07-28NORSPEC-314 fix the fullbright alpha mask logicGraham Madarasz
2013-07-28STORM-1957 World Map - Land For Sale is missing L$ / sqmJonathan Yap
2013-07-26mergeGilbert Gonzales
2013-07-26ACME-755 Clear FB cookies by removing cookies from the .facebook.com domainGilbert Gonzales
2013-07-26NORSPEC-327 modify 'select' ops in srgb shader code to mollify the doddering ↵Graham Linden
mac GLSL compiler
2013-07-26NORSPEC-327 modify 'select' ops in srgb shader code to mollify the doddering ↵Graham Linden
mac GLSL compiler
2013-07-26CHOP-955: merge viewer_manifest.py file_list fixNat Goodspeed
2013-07-26CHOP-955: Include app_settings/settings_install.xml in file_list.Nat Goodspeed
viewer_manifest.py uses its base-class llmanifest.LLManifest.put_in_file() method to create several different files in the install image being marshalled. I based the logic to create settings_install.xml on that example. Unfortunately I failed to notice that after every existing call, the script also explicitly appended the newly-created file to self.file_list... which only matters on Windows. file_list is fed to the NSIS installer. Change put_in_file() method to implicitly append to self.file_list. Change every existing viewer_manifest.py call to pass new put_in_file(src=) param instead of explicitly appending to self.file_list.
2013-07-26Automated merge with ssh://hg.lindenlab.com/nat/viewer-chop-951Nat Goodspeed
2013-07-26CHOP-962: merge code-review fixes with viewer-releaseNat Goodspeed
2013-07-26CHOP-962: per code review, comment that other code relies on "Global".Nat Goodspeed
The comment advises grepping for "Global" rather than specifically pointing to llcontrol.cpp because that's NOT the only place that relies on the name "Global"! Besides, by the time someone does want to change the name, still other such dependencies could've crept in.
2013-07-25ACME-745 : Fix : Do not oversanitize the logged URLs...Merov Linden
2013-07-25ACME-773 Remove the 'Use another account...' in the ACCOUNT panelGilbert Gonzales
2013-07-25SH-4365 SH-4367 Conversion of mesh uploaders to llcorehttp.Monty Brandenberg
With this checkin, legacy LLCurl is out of the mesh code. Uploaders and responders are converted and functioning. Logging has been cleaned up throughout the code to use the macro form with tag/subtag capability. DEBUGS-level logging added for some upload path milestones. Better error information flow from failed responses to viewer alert boxes but I'd really, really like to do better here. Mesh upload problems are completely opaque as a user. Minor cleanups (removed dead members, method signatures tidied, less data conversion). Could almost call this complete, will likely have platform cleanups, however.
2013-07-25CHOP-962: Make LLControlVariable::setPersist() accept only enum.Nat Goodspeed
Initial change made LLControlVariable::mPersist an enum, but retained bool/BOOL public API. setPersist(true) set one value, setPersist(false) set another, forcePersist() set the third. Per code review, expose enum to public, make setPersist() (and LLControlVariable constructor, and LLControlGroup:: declareControl(), and all the LLControlGroup::declareMumble() methods, and all the unit-test dummy declareMumble() method bodies) accept that enum. Remove forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly. Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
2013-07-25Kill all the vivox logsAura Linden
2013-07-25Restore VITA LLNotiication APIJeff (Gioffredo Linden)
2013-07-25VITA test framework - record events supportJeff (Gioffredo Linden)
2013-07-25Make use of vertex_color selectable per shader with alphaF/alphaV againGraham Linden
2013-07-25NORSPEC-324 set gamma value for avatar alpha shader too for gamma correct ↵Graham Linden
eyelashes
2013-07-25MAINT-2715 FIX Capabilities request handling not working properly if request ↵PavelK ProductEngine
gets lost