summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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.
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-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
2010-09-22merge storm-187Tofu Linden
2010-09-22Automated merge with ssh://hg.lindenlab.com/davep/viewer-mesh/Nyx Linden
2010-09-22SH-64 update glod on macNyx Linden
GLOD libraries were being copied to the lib as lowercase, where mac expects GLOD to be capitalized (linux expects lowercase). Updating to new lib with correct capitalization.
2010-09-22STORM-187 FIXED Fixed chatbar not getting back its width after ↵Andrew Productengine
opening/closing sidetray. The bug reproduced not only for opening/closing sidetray, but also when viewer window was resized. The chatbar's width was set to default on width increase, it was also shrunk even when there was enough space for it, and buttons could be shrunk instead. Also, width to which user resized it manually, was not used in resizes. Gave priority on resizes to nearby chat - i.e.: Before this fix priorities were- buttons are visible -> buttons are as wide as possible -> nearby is stretched. After this fix priorities are- buttons are visible -> nearby is stretched -> buttons are as wide as possible. - Added new member which stores width of nearbychat(either value that was recorded after user's manual resize of chatbar or default). Used it as a value to which chatbar tries to be resized on resizes. - Implemented the change of priorities described above in processWidthIncreased() and processWidthDecreased() methods.
2010-09-22SH-150 FIX - build params changes for mesh beta viewer, flag in window titleBrad Payne (Vir Linden)
2010-09-22merge whitespace changes from Boroondas.Tofu Linden
2010-09-22doh, fix this in the RIGHT place.Tofu Linden
2010-09-22CID-505Tofu Linden
Checker: UNINIT_CTOR Function: LLGridManager::LLGridManager() File: /indra/newview/tests/lllogininstance_test.cpp
2010-09-22CID-509Tofu Linden
Checker: UNINIT_CTOR Function: LLAvatarListItem::LLAvatarListItem(bool) File: /indra/newview/llavatarlistitem.cpp
2010-09-22CID-510Tofu Linden
Checker: UNINIT_CTOR Function: LLVOCache::LLVOCache() File: /indra/newview/llvocache.cpp
2010-09-22CID-511Tofu Linden
Checker: UNINIT_CTOR Function: LLVOCacheEntry::LLVOCacheEntry(LLAPRFile *) File: /indra/newview/llvocache.cpp
2010-09-22CID-512:Tofu Linden
Checker: DEADCODE Function: show_item_sharing_confirmation(std::basic_string<char, std::char_traits<char>, std::allocator<char>>, LLViewerInventoryItem *, const LLSD &, const LLUUID &, const LLUUID &) File: /indra/newview/lltooldraganddrop.cpp
2010-09-22merge storm-162Tofu Linden
2010-09-22Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching ↵Dave Parks
type back into tools floater.
2010-09-22mergeDave Parks
2010-09-22Stop using aligned malloc in llvertexbuffer (tcmalloc is automagically aligned).Dave Parks
2010-09-22SH-100, SH-111 Fix for generate normals stalling/crashing.Dave Parks
Switch from "new" to "malloc" in llvolume.cpp aligned arrays so "realloc" can be used to avoid copies.