summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2012-07-09correct dos line endingsOz Linden
2012-07-09merge back more late beta fixes from 3.3.4Oz Linden
2012-07-09merge changes for DRTVWR-177Oz Linden
2012-07-08merge changes for DRTVWR-176Oz Linden
2012-07-08merge up to latest integration branchOz Linden
2012-07-08merge changes for DRTVWR-176Oz Linden
2012-07-06Automated merge with ssh://hg.lindenlab.com/simon/viewmasterXiaohong Bao
2012-07-06fix for MAINT-1201: 404 errors appear in the log when opening the world mapXiaohong Bao
2012-07-06Automated merge with https://bitbucket.org/VirLinden/dranoXiaohong Bao
2012-07-06fix for SH-3234: Map tile fetching broken in drano buildXiaohong Bao
2012-07-06trivial: convert to Unix line endings.Xiaohong Bao
2012-07-06MAINT-1228 FIX Can not put more than one object into the contents of an objectcallum
Reviewed by Paul PE
2012-07-05Adding the pathfinding attributes to the object profile panel.Todd Stinson
2012-07-05partial changes for building with the llphysicsextensions source packageOz Linden
2012-07-05successful build with llphysicsextensions stubOz Linden
2012-07-05MAINT-436 FIXED Set focus to line editor if it exists in alert toastmaxim_productengine
2012-08-06MAINT-73 FIXED Hide Stand/Stop flying panel after pressing Ctrl-Shift-Umaxim_productengine
2012-08-03Merge back changes from viewer-lion with latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-01Merge back viewer-lion, which has viewer-development and down-stream fixessimon@Simon-PC.lindenlab.com
2012-07-31MAINT-1305 llDialog tooltip typoKelly Washington
2012-07-30Fix linux build crankinesssimon@Simon-PC.lindenlab.com
2012-07-30mergeDave Parks
2012-07-30MAINT-570 Fix for linux build.Dave Parks
2012-07-25MAINT-1042: Blocking asset avatar prevents future uploads. Reviewed by Kelly.simon@Simon-PC.lindenlab.com
2012-07-25MAINT-615 Fix for texture animation freezing under certain situations.Dave Parks
2012-07-25MAINT-611 Differentiate between mobile and not mobile NVIDIA GPUs in the gpu ↵Dave Parks
table.
2012-07-20MAINT-570 Remove unused memory tracking system LLMemTypeDave Parks
2012-07-18mergeDave Parks
2012-07-18MAINT-628 Fix for seams in high res snapshots when lighting and shadows is ↵Dave Parks
enabled.
2012-07-17mergesimon@Simon-PC.lindenlab.com
2012-07-17MAINT-1276: Add ability to paste LSL tooltips into scripts. Reviewed by Kellysimon@Simon-PC.lindenlab.com
2012-07-16MAINT-1270 Fix for some flexi prims becoming flat at some LoDsDave Parks
2012-07-05begin integrating building of llphysicsextensions from source here (incomplete)Oz Linden
2012-07-03MAINT-1231 Investigate increasing MAX_CACHED_GROUPS in llgroupmgr.cppKelly Washington
* increased max groups to 20 * changed cache to LRU instead of 'delete half when overfull' reviewed with Baker
2012-07-03PATH-805: guard all uses of sInstance in LLPanelLoginOz Linden
2012-07-03FIX INTL-99 set32 translation for 8 languageseli
2012-07-03MAINT-685 Fix for disabling basic shaders making high detail terrain render ↵Dave Parks
incorrectly.
2012-07-03merge up to latest pathfinding project viewerOz Linden
2012-07-03PATH-802: fixed check for different grid in chat SLURLSOz Linden
2012-07-02MAINT-971 : [PUBLIC]Renaming a new inventory item while filtering item namessimon@Simon-PC.lindenlab.com
renames parent folder instead. Reviewed by Kelly
2012-07-02merge back changes from 3.3.4-beta2Oz Linden
2012-07-02improve logging of invalid grid definitions, prevent clashes with old viewersOz Linden
2012-06-29Ensuring that the code and tests build correctly when HACKED_GODLIKE_VIEWER ↵Todd Stinson
is defined.
2012-06-29PATH-797: BUGFIX Altering how the rows are being added to the scrolllist ↵Todd Stinson
widget to avoid a regression that occurred after merging from viewer-release recently caused the time to load a large number of elements to increase substainally.
2012-06-29Merge simon/viewmaster-merge for latest maint worksimon@Simon-PC.lindenlab.com
2012-06-29merge changes for DRTVWR-174Oz Linden
2012-06-29Fix --skin command-line switch by mapping to the correct var name.Nat Goodspeed
It said it mapped to 'SkinFolder', which doesn't exist. 'SkinCurrent' is correct.
2012-06-29Specialize Steam skin by adding sourceid= to join.secondlife.com URL.Nat Goodspeed
Of course, preserve lang= localization from default skin. Assume that localized steam/xui/*/strings.xml file without create_account_url key will default to create_account_url key from steam/xui/en/strings.xml. That's how it works in the default skin, anyway.
2012-06-29Add 'steam' skin, initially only strings.xml, identical to default.Nat Goodspeed
Splitting the 'add' from modifications unique to this skin facilitates code review.
2012-06-29Make Russian and Turkish viewers link to join.secondlife.com lang=.Nat Goodspeed
We have appropriate translations of the join.secondlife.com registration path, but the Russian and Turkish [create_account_url] strings in strings.xml didn't specify them. At Eli's request, added lang= params to these two.