summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-11-14merge with headcallum_linden
2014-11-14Cinder pointed out my fix here for clang pickiness was different from hers ↵callum_linden
so I investigated and this is the causes of the slowdown - wrongly placed parens
2014-11-14Reworked changes to more closely match Cinders' - hers seem more correctcallum_linden
2014-11-14rewrite an llframetimer test to be less sensitive to extended ms_sleep callsOz Linden
2014-11-14Convert llhash() to use boost::hash, per Cinder's suggestion.Nat Goodspeed
2014-11-14Commit backing out the breakpad change.Nat Goodspeed
2014-11-14Backed out changeset eac237bfebba (Aura's commit for new breakpad)Nat Goodspeed
This is an attempt to diagnose a generate_breakpad_symbols.py exception on a Yosemite TC build host.
2014-11-14MAINT-4537 WIP - joint position management during outfit changesBrad Payne (Vir Linden)
2014-11-14Remove a couple tests for unsigned long < 0.Nat Goodspeed
clang correctly notes that such tests add nothing to the runtime behavior of a program. Unfortunately, clang notes that in the form of a compile error.
2014-11-14MAINT-4678: fix crash on launch in gpu benchmarkOz Linden
2014-11-14Comment out now-unused GPU_TABLE_FILENAME in llfeaturemanager.cpp.Nat Goodspeed
The "death to the GPU table" change has commented out the only references to the GPU_TABLE_FILENAME constant, and Xcode 6.x regards that as an error.
2014-11-14Skip LLFrameTimer test<3>, which fails with Xcode 6.x builds.Nat Goodspeed
Hopefully this is temporary until we figure out the real problem!
2014-11-14Update viewer-tools-update viewer to updated 3p-update-curl build.Nat Goodspeed
Build 296787 of 3p-update-curl includes the latest tip of 3p-curl.
2014-11-14MAINT-4537 WIP - order of operations during outfit changeBrad Payne (Vir Linden)
2014-11-14Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2014-11-13Repointed autobuild to latest google breakpad for great stacks and less ↵obscurestar
warning messages.
2014-11-13MAINT-4092 FIXED Prim faces with opaque diffuse maps, with material set to ↵ruslantproductengine
ALPHA_MODE_BLEND, do not render MAINT-4645 FIXED [viewer-lion] The build tool shows normal or specular map as 'none' when one exists
2014-11-14MAINT-3067 FIXED Bumps, Pushes and Hits is hard to discoveMnikolenko ProductEngine
2014-11-12Eliminate LLAppViewer::cleanup() dup --analyzeperformance code block.Nat Goodspeed
Not sure at what point the redundancy was introduced, but it seems clear we only want to run performance analysis once per shutdown.
2014-11-12MAINT-4660 FIXED making Photosandreykproductengine
2014-11-11MAINT-4657 FIXED Objects can appear to have wrong 'for sale' type when ↵andreykproductengine
viewed in inventory
2014-11-12MAINT-4662 FIXED Packet Loss always shows zero in the statistics floaterMnikolenko ProductEngine
2014-11-11Merge changes for 3.7.20-releasemaksymsproductengine
2014-11-10Fix typo in new viewer_manifest.py codesigning logic.Nat Goodspeed
'raisef' is not a Python statement.
2014-11-10mergeBrad Payne (Vir Linden)
2014-11-10Merge. Refresh from viewer-release after 3.7.20 released.Monty Brandenberg
2014-11-10merge changes for 3.7.20-releaseOz Linden
2014-11-10increment viewer version to 3.7.21Oz Linden
2014-11-10Added tag 3.7.20-release for changeset 27094824773bOz Linden
2014-11-10MAINT-4617 FIXED Viewer chews on "Inventory->Open and Select" until ↵andreykproductengine
inventory received or recent items selected
2014-11-07MAINT-1333 FIXED Disable "for sale" controls for attached primMnikolenko ProductEngine
2014-11-06BUG-7698, BUG-7688, BUG-7694 (others) CDN connection issues.Monty Brandenberg
Under pipelining, requests were given a 5x timeout factor due to the way that the timeout clock works in libcurl. Under CDN load, connections were not being torn down quickly and it was only this timer that led to disconnect and retry. So, we want to break a connection that isn't making progress but that isn't immediately possible. We'll compromise with a 60S timeout that (we hope) will be neither too long for stalled connections nor too short for large asset transfer requests.
2014-11-05mergeBrad Payne (Vir Linden)
2014-11-05MAINT-202 FIXED Can't open scripts in copied objects individually on the viewer2andreykproductengine
2014-11-06MAINT-3067 FIXED Show context menu when right clicking avatar name in the ↵Mnikolenko ProductEngine
list. Bumps, Pushes and Hits moved to Help from Develop menu
2014-11-05MAINT-4621 FIXED start new session with the caller (if it doesn't exist) and ↵Mnikolenko ProductEngine
only then show autoreject message
2014-11-03Merge downstream code and become 3.7.20simon
2014-11-03mergeBrad Payne (Vir Linden)
2014-11-03Pull in viewer-release and become version 3.7.20simon
2014-11-03MAINT-3585 FIXED Viewer Crashes when attempting to upload image.ruslantproductengine
The bug was fixed, the reasone of crash is following. The Core Flow view contain another GL context and will not care about restoring a previous. I restore context manually. This path also contain a minor changes in another files. All changes described here. Сhange's for fix current bug. indra/llwindow/llwindow.h indra/llwindow/llwindowheadless.h indra/llwindow/llwindowmacosx.h indra/llwindow/llwindowsdl.h indra/llwindow/llwindowwin32.h indra/newview/lllocalbitmaps.cpp indra/newview/llviewerdisplay.cpp indra/newview/llviewerdisplay.h Twice mUsage initialization (replace to forward initialization). indra/llcharacter/lljointstate.h Looks like condition should be befor memcopy call, otherwise - possible CRASH. indra/llcommon/llmd5.cpp Unused condition and variables. indra/llmath/llsphere.cpp Looks like should be under if otherwise - possible CRASH indra\llprimitive\llmodel.cpp Useless assert's. indra/llrender/llrender.cpp indra/newview/lldaycyclemanager.cpp
2014-11-04MAINT-4499 FIXED Forgotten password button is not aligned with Password ↵Mnikolenko ProductEngine
input field
2014-11-04MAINT-4581 FIXED Flickr slurl links break on some regions with spaces in the ↵Mnikolenko ProductEngine
region name
2014-11-04MAINT-4619 FIXED Using Align Planar Faces on flexible prims causes viewer to ↵Mnikolenko ProductEngine
crash
2014-11-03Merge downstream code and become 3.7.20simon
2014-11-03MAINT-1884 FIXED "Shortcut Key" text label is overlapped by drop-down lists ↵andreykproductengine
in Preview floater when user opened more then one gesture
2014-11-03SL-93 WIP - pelvis fixup offsetsBrad Payne (Vir Linden)
2014-10-31settings.xml updateBrad Payne (Vir Linden)
2014-10-30SL-93 WIP - missing includeBrad Payne (Vir Linden)
2014-10-30MAINT-4617 FIXED Viewer chews on "Inventory->Open and Select" until ↵andreykproductengine
inventory received or recent items selected
2014-10-31MAINT-3560 FIXED Unused setting MaxFPS was deletedMnikolenko ProductEngine