summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-29Merge changes from product-engine branchOz Linden
2010-08-27Removing two extraneous entries from viewer-hg-convert.shamap.Monroe Linden
2010-08-27Reconstructed viewer-hg-convert.shamap for the viewer-public mergeAimee Linden
2010-08-27mergeTofu Linden
2010-08-27Pull cg's BuildParams fixesMerov Linden
2010-08-27Sync with viewer-developmentMerov Linden
2010-08-27Clean up Comments in BuildParams; Replace explicit upload locations with ↵Christian Goetze (CG)
"public_build" policy.
2010-08-27SNOW-766: Add a 'printbuilddirs' command to develop.pyAleric Inglewood
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-26CTS-219 Fix for broken geometry when importing from polygons.Dave Parks
2010-08-26Disable edit-and-continue (makes breakpoints not work on occasion).Dave Parks
2010-08-26VWR-20946 : use fixed linux bundle for kduMerov Linden
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-26Fix for crash when rendering translation handles.Dave Parks
2010-08-26buildfix removing unnecessary line in llvector4a.hNyx (Neal Orman)
upon further review, falcon determined this fix was unnecessary.
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-26lame-but-effective workaround for self-editing UI bug, until the right fix ↵Tofu Linden
is ready.
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-26update tagsconvert-repo
2010-08-25Automated merge with https://hg.lindenlab.com/davep/viewer-experimentalDave Parks
2010-08-25mergeDave Parks
2010-08-25Sync with viewer-developmentMerov Linden
2010-08-25Sync with viewer-developmentMerov Linden
2010-08-25VWR-20710 : Sit anywhere, port of SG2.x SNOW-610 patchMerov Linden
2010-08-25mergeTofu Linden
2010-08-25Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-25MergeAimee 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-25MergeAimee Linden
2010-08-25EXT-8398/EXT-8300 FIXED Avatar icons displaced from SLURL profile linksAimee Linden
Icon was being inserted before any text preceding the link. Reviewed by Richard.
2010-08-25BuildParams - Use new 'build_debug_release_separately' flag for ↵Aimee Linden
viewer-development
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-24Sync with viewer-developmentMerov Linden
2010-08-24Modified llkdu pointer for all platforms, cleaned up unused kdu-binaries ↵Merov Linden
references, fixed llkdu cmake to simply point to lib and build
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.