summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-09-09mergeDave Parks
2010-09-09Better debug visualization for raycasting (trying to track down raycasting ↵Dave Parks
bugs).
2010-09-09Massage importer UIDave Parks
2010-09-09GLOD update for windows, poke CMakeLists.txt to copy shared libs over if ↵Dave Parks
glod is touched.
2010-09-08SNOW-606 FIX disable packaging of libuuidNyx (Neal Orman)
Patch taken from JIRA, committing locally to fix our project branch. Code reviewed by Nyx / Brad
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-03Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/Nyx (Neal Orman)
2010-09-03CTS-237 WIP test performance to validate new ARC algorithmNyx (Neal Orman)
minor cleanup and fixing the linux build.
2010-09-02Fix for crash when loading models (Don't hit UI from the main thread). ↵Dave Parks
Added asserts to LLFastTimer to verify main thread use only.
2010-09-01CTS-231 WIP new ARC algorithmNyx (Neal Orman)
tweaked some numbers that were incorrect when I originally wrote the algorithm deminimis change, no review
2010-09-01Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/Nyx (Neal Orman)
2010-09-01CTS-231 WIP create new ARC algorithm to be more accurate and account for meshesNyx (Neal Orman)
First pass - uses the new algorithm to hopefully be more accurate of render load on low-end machines. Also accounts for mesh complexity, including if a mesh is weighted or non-weighted. Code reviewed by davep
2010-08-31Merge cleanup.Dave Parks
2010-08-31mergeDave Parks
2010-08-31CT-575 WIP FR linguistic; restore 1 missing stringEli Linden
2010-08-31CT-575 WIP FR linguisticEli Linden
2010-08-30pull internationalization fixes from faulty splitOz Linden
2010-08-31Fix double definition of create_jump_keys="true" introduced in the fix for ↵Aimee Linden
VWR-20724 to pass coding policy check.
2010-08-31MergeAimee Linden
2010-08-29pull changes for EXT-8668 and EXT-7901Oz Linden
2010-08-29merge up to latest viewer-developmentOz Linden
2010-08-27Sync with viewer-developmentMerov Linden
2010-08-27Sync with viewer-developmentMerov Linden
2010-08-27Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/Nyx (Neal Orman)
2010-08-26Sync with viewer-developmentMerov Linden
2010-08-26VWR-20946 : fix erroneous error message (broken window...)Merov Linden
2010-08-26VWR-20946 : fix the viewer manifest script to take the new kdu lib name into ↵Merov Linden
account
2010-08-26Add missing xml files from viewer-experimentalDave Parks
2010-08-26Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/Nyx (Neal Orman)
2010-08-26buildfix - replaced NULL with FALSENyx (Neal Orman)
gcc doesn't like passing NULL where you mean FALSE. This unsticks the linux build. de-minimis change, no review.
2010-08-26Fix for various physics shape rendering glitches.Dave Parks
2010-08-26buildfix: fixing linux build to handle new SSE2 architectureNyx (Neal Orman)
code reviewed by davep and falcon
2010-08-26Remove redundant panel_classified.xml XUI file.Aimee Linden
2010-08-26Add missing files from viewer-experimentalDave Parks
2010-08-26re-merge change from Thickbrick (minor collisions with changes from ↵Oz Linden
viewer-public merge)
2010-08-26EXT-8727 FIXED Potential fix for a crash in ↵Vadim Savchuk
LLAppearanceMgr::updateClothingOrderingInfo. I couldn't reproduce the problem (it has happened for only two users, both running MacOSX), but from what I see in the logs, it might have been caused by (or related to) NULL COF items. I haven't found out how they appear nor what exactly causes the crash, but just for any case I added a check to make sure we don't try to update wearables ordering info for such items. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/876/ --HG-- branch : product-engine
2010-08-26Manual merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-26re-merge viewer-public. has a rough edge or two, but this is closer to the ↵Tofu Linden
snowglobe2.1 and viewer2.2 code, and beats people re-applying their viewer-public changes piecemeal while waiting for this to land.
2010-08-26EXT-7901 FIXED: Follow up fix to remove short-term hack.Lynx Linden
As advertized, I have removed the short-term hack that I put in place to make release note URLs work. I have now put in place a more general and correct solution. The key observeration from Roxie is that SLE SLurls should have the same hostname as the grid host. So now, URLs like http://google.com/app are no longer categorized as a SLurl and produce errors when you click on them.
2010-08-25mergeDave Parks
2010-08-25VWR-20710 : Sit anywhere, port of SG2.x SNOW-610 patchMerov Linden
2010-08-24Update GLSL shader sources to current $LicenseInfo$ standard.Nat Goodspeed
See https://wiki.lindenlab.com/wiki/License_Substitution for details.
2010-08-24mergeMark Palange (Mani)
2010-08-24mergeMark Palange (Mani)
2010-08-24Suppress llkdu target on Windows build, re-enable manifest check for llkdu.dllMerov Linden
2010-08-24Re-add Dutch XUI files omitted from viewer-development conversion.Nat Goodspeed
In the original viewer-hg-convert.map file, some of the skins/default/xui/nl pathnames were mysteriously truncated, causing the corresponding files to be omitted from the initial conversion.
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