summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-09-24STORM-173 : Add Build > Object > Return ObjectMerov Linden
2010-09-24Mergeprep linden
2010-09-24Fixed a mesh upload issue where if the asset did not contain a rig the ↵prep linden
avatar would disappear for the current session.
2010-09-24mergeDave Parks
2010-09-24SH-213 Fix for crash when selecting face.Dave Parks
2010-09-24Added support for joint offsetsprep linden
2010-09-24merge storm-189 reduxTofu Linden
2010-09-23Pulling one bugfix changeset from another repository.Monroe Linden
2010-09-23mergeRichard Linden
2010-09-23fix for llviewernetwork integration testRichard Linden
2010-09-23Fixed some build errors in llmediaplugintest.cpp.Monroe Linden
Reviewed by Richard.
2010-09-23dummy commit to track experience team work:Richard Linden
EXP-11 UI Optimizations EXP-12 Selective Pop-up Blocking EXP-5 UI Hints EXP-6 Side Panel Tutorial EXP-3 Enable Pop-up Web Content EXP-13 Javascript Handling EXP-56 Add support for file picking to LLQtWebKit and hook up to media plugin EXP-59 Some buttons disappear when clicked QAR-3491 "Tutorial in the side panel" QAR-3448 "UI Hints Experience Sprint 1" QAR-3440 "Pop-Up Web Content in Viewer Experience Sprint 1 QAR" QAR-3439 "UI Performance Improvements Experience Sprint 1 QAR"
2010-09-24STORM-189 FIXED Truncations in DE ans ES locales in Build Tools floater.Seth ProductEngine
- Some checkboxes moved in DE locale and EN xml file. - Removed floater width override for ES locale.
2010-09-23Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/Nyx (Neal Orman)
2010-09-23SH-211 FIX update viewer-mesh branch to use new tcmalloc packageNyx (Neal Orman)
Finished changes to make viewer-mesh make use of tcmalloc on linux. Almost all changes are juggling cmake config files, to make sure that the package is downloaded, installed, moved at the right times, and linked at the right times. Code reviewed by Seraph
2010-09-23mergeBrad Payne (Vir Linden)
2010-09-23mergeRichard Linden
2010-09-23WIP make tcmalloc work on linux (JIRA pending)Nyx (Neal Orman)
First pass at integrating the linux version of tcmalloc. Code will be reviewed in a later commit before pushing.
2010-09-23STORM-199 MergeAimee Linden
2010-09-23STORM-153 ADDITIONAL FIX Fixed unlocalized chiclet tooltip and syswell ↵Andrew Productengine
session names for adhoc. Bug was caused by using incorrect (unlocalized) name of session as argument for some methods after the session name was localized in constructor. - Used correct (localized) session name instead.
2010-09-23Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/Nyx Linden
2010-09-23SH-64 update GLOD on macNyx Linden
updated GLOD again to be searched for in the correct place and updated some cmake configuration to ensure that it is being referred to in the correct places. This appears to finally solve our mac startup crash.
2010-09-23merge storm-206Tofu Linden
2010-09-23mergeTofu Linden
2010-09-23Backed out changeset acb451f83a9dTofu Linden
original commit log for acb451f83a9d was: "Temporary changes to allow the viewer to build against an older version of llqtwebkit. NOTE: once updated builds of llqtwebkit are available on all platforms, this changeset should be backed out." So, yes, I'm backing that out.
2010-09-23STORM-128 SUPPLEMENTARY Move new permissions icons into the icons directory.Aimee Linden
2010-09-23STORM-128 FIXED New friends list permission iconsAimee Linden
* Added new icon artwork. * Reordered the icons so that the most common ones are to the right, so that they change position as little as possible. * Removed old 1.23 icons.
2010-09-23STORM-201 FIXED Substituted link to widgets page on internal LL wiki in test ↵Andrew Productengine
floater with external one.
2010-09-23SH-176 Fix for physics triangle limit limiting high LOD triangle limit.Dave Parks
2010-09-22fixed buildRichard Linden
2010-09-22mergeRichard Linden
2010-09-22Fix "no newline at end of file".Monroe Linden
2010-09-22mergeRichard Linden
2010-09-22fix for gccRichard Linden
2010-09-22Temporary changes to allow the viewer to build against an older version of ↵Monroe Linden
llqtwebkit. NOTE: once updated builds of llqtwebkit are available on all platforms, this changeset should be backed out.
2010-09-22SH-108/SH-88 Add better permissions block and physics_shape_type to uploaded ↵Dave Parks
mesh assets. Reviewed by Falcon.
2010-09-23STORM-199 FIXED Added wearing an object from Library if it was dragged to COFSergei Litovchuk
- Disabled moving items from in-world objects to COF or outfit folders not to create copies of items instead of links. - Enabled dropping a landmark from Library to certain position in Favorites folder which supports items reordering.
2010-09-22mergeDave Parks
2010-09-22SH-93 Disable mirror/invert check boxes when sculpt type is set to mesh. ↵Dave Parks
Also fixed a crash when switching sculpt type from mesh to sphere.
2010-09-22Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/Nyx (Neal Orman)
2010-09-22SH-188 crash in llvoavatar.cppNyx (Neal Orman)
We were using a NULL pointer after checking it was null due to a logic error. Re-shuffled the logic to ensure we would only dereference pointer after it was known to be non-null Code reviewed by Seraph
2010-09-22instead of exposing mutable container in LLInitParam::Multiple, just expose ↵Richard Linden
access functions, begin(), end(), etc. this allows mutation of param block contents, without being able to change number of elements
2010-09-22mergeDave Parks
2010-09-22SH-110 Fix for viewer crash when checking HULL in decomposition window... ↵Dave Parks
converted various maps to use smart pointers for keys instead of naked pointers, properly clear maps on various operations.
2010-09-22fix for SH-173/VWR-22868: Development Viewer freezes just after startup / ↵Xiaohong Bao
greedy with file handles / 'WARNING: ll_apr_warn_status: APR: Too many open files' (transplanted from a9aefa70c029eb9dddec3833d0ce22ef4b4421b5)
2010-09-22mergeBrad Payne (Vir Linden)
2010-09-22MergeMatthew Breindel (Falcon)
2010-09-22Minor fixes to simulator console.Matthew Breindel (Falcon)
2010-09-22merge storm-163 / Port of VWR-14914 to SG 2.0 : Intermittent FPS drop ↵Tofu Linden
related to "audio" (main thread hangs often on openal lock)
2010-09-22Commenting out unused variables to help mac buildJonathan Wolk