summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-09-27mergeDave Parks
2010-09-27Switching build location to public as discussed.Dave Parks
2010-09-27mergeTofu Linden
2010-09-27MergeKelly Washington
2010-09-27merge storm-153 re-fix.Tofu Linden
2010-09-27merge storm-228Tofu Linden
2010-09-27merge storm-190Tofu Linden
2010-09-27merge storm-173Tofu Linden
2010-09-27STORM-153 ADDITIONAL FIX Properly fixed unlocalized chiclet tooltip and ↵Andrew Productengine
syswell session names for adhoc. Bug was caused by using unlocalized name of session as argument in LLIMModel::newSession() after the session name was localized in constructor. - Used correct session name in LLIMModel::newSession(). Adding similar logic to addMessage() turned out to be unnecessary and also caused regression (VWR-23180), so previous fix of the same bug(8ab901af1241) was backed out in 28ed1b4cf4cd. Erroneous part was excluded from this fix.
2010-09-27STORM-228 FIXED 'Loading / Done' text is cropped on the bottom of 'Find' floaterPaul Guslisty
-Increased space between bottom of the floater and bottom of the web browser (inside floater), so that 'Loading / Done' text between bottom of the web browser and bottom of the floater won't be cropped
2010-09-27STORM-190 FIXED text truncations in floater EDIT CONTENT PERMISSIONS.Sergei Litovchuk
- Increased overall floater width. - Increased permissions columns width. - Increased 'Check All' and 'Clear' buttons width. - Applied text wrapping to permissions labels. - Removed 'NextOwnerLabel' dimensions overrides for German. - Removed 'Check All' and 'Clear' buttons dimensions overrides for Polish.
2010-09-25Fix for foldertype_bad_lookup nonsense (requires clearing of cache and ↵Dave Parks
bad_lookup folder and/or a fresh inventory copy from agni to take effect).
2010-09-24mergeDave Parks
2010-09-24Fix for bad zipping of meshes and add mesh icon back to repository.Dave Parks
2010-09-24VWR-21377 Script editor ctrl-f fix.Kelly Washington
make ctrl-f work from the script search box itself.
2010-09-24VWR-21377 Script editor ctrl-f fix.Kelly Washington
change to better / more consistent naming
2010-09-24VWR-21377 Script editor ctrl-f fix.Kelly Washington
let some LLViews handle shortcut keys if they want. reviewed with ambroff
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-23SH-211 FIX use updated tcmalloc lib on linuxNyx (Neal Orman)
Previous version was rejected by our build machines. This update was build with -fno-stack-protector, so should be able to be built by teamcity.
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-23mergeRichard Linden
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-23Merged support for platform specific permanent quick links to the installerChristian Goetze (CG)
2010-09-23Add support for platform specific permanent quick links to the installerChristian Goetze (CG)
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-23Linux rebuild of llqtwebkit from the following sources:Tofu Linden
revision aacdf69cbf5aa12d77c179296e31ef643ed1ef4a of http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch) revision 81ab5ae326f0 of http://hg.secondlife.com/llqtwebkit (currently head of the default branch)
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.