summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-08-31pull from viewer-developmentLoren Shih
2010-08-31automated mergeLoren Shih
2010-08-31VWR-22692 FIXED Multiattachments don't save correctly in outfitsLoren Shih
Fixed login issue that was causing multiattachments to be replaced instead of added.
2010-08-31CT-575 WIP FR linguistic; restore 1 missing stringEli Linden
2010-08-31CT-575 WIP FR linguisticEli Linden
2010-08-31VWR-22724 FIXED Clicking an attachment switched the Add More inventory to ↵Paul Guslisty
Flat view Added checking when item in COF list selected: IF (FolderListView is shown) THEN (don't switch to the FlatListView AND set proper filter for FlatListView). Reviewed by Vadim Savchuk
2010-08-31VWR-22723 Add More category picker defaults whenever a clothing item is removedPaul Guslisty
- After wearable removed from COF list, check: whether any outfit of the same wearable type as removed left in COF. If left then select it. - Added method selectClothing(LLWearableType::EType) to the LLCOFWearables that selects first clothing from COF of specified WearableType Reviewed by Vadim Savchuk
2010-08-31VWR-22280 FIXED Add "language" parameter to all XMLRPC call (Buy L$ and Buy ↵Vadim Savchuk
Land).
2010-08-30pull internationalization fixes from faulty splitOz Linden
2010-08-31Fix double definition of create_jump_keys="true" introduced in the fix for ↵Aimee Linden
VWR-20724 to pass coding policy check.
2010-08-30a try to fix EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2DXiaohong Bao
2010-08-31MergeAimee Linden
2010-08-30VWR-20970 FIXED Added SideTrayButton class to handle mouse hover events to ↵Sergei Litovchuk
"tear off" Side Tray tabs.
2010-08-30[mq]: VWR-19499-AppUriChatLimitArdy Lay
2010-08-30merging up from viewer-developmentAaron Terrell (Enus)
2010-08-30Dummy checkin to test pushes. No code change.Loren Shih
2010-08-30EXT-8771 Avatar Physics causes crash on login with release viewerLoren Shih
Added backwards compatibility support for new wearable types.
2010-08-29pull changes for EXT-8668 and EXT-7901Oz Linden
2010-08-29merge up to latest viewer-developmentOz Linden
2010-08-28MergeAimee Linden
2010-08-27VWR-20926 FIXED Fixed displaying the fake "Sidebar Toggle" tab when you ↵Vadim Savchuk
detach all sidebar tabs. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/880/
2010-08-27VWR-20696, VWR-20697 FIXED Fixed selecting re-docked tab and toggling its ↵Sergei Litovchuk
tag button state. Minor optimization of Side Tray expanding/collapsing upon toggling tab docked/undocked. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/879/.
2010-08-27Sync with viewer-developmentMerov Linden
2010-08-27Sync with viewer-developmentMerov Linden
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-26mergeMark Palange (Mani)
2010-08-27VWR-20926 WIP Enabled sidebar to track detaching/attaching tabs.Vadim Savchuk
TODO: Sometimes wrong tab gets selected after attaching/detaching. Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/878/
2010-08-26Remove redundant panel_classified.xml XUI file.Aimee Linden
2010-08-26VWR-20696, VWR-20697 WIP Added undocking/redocking tabs from Side Tray.Sergei Litovchuk
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/877/.
2010-08-26re-merge change from Thickbrick (minor collisions with changes from ↵Oz Linden
viewer-public merge)
2010-08-26EXT-8668 - Fixing accidental case change for the sake of OCD.Mark Palange (Mani)
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-26VWR-20715 Double-click teleportAimee Linden
SNOW-352/SNOW-421/SNOW-462 Imported from Snowglobe 2 By Twisted Laws and Thickbrick Sleaford
2010-08-26Manual merge from default branchVadim Savchuk
--HG-- branch : product-engine
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-26fix for VWR-19505ZaiLynch
2010-08-25VWR-20710 : Sit anywhere, port of SG2.x SNOW-610 patchMerov Linden
2010-08-25standardizing a couple of stragler test 'suite' names as class nameAaron Terrell (Enus)
2010-08-24standardizing test suite names as class name under testAaron Terrell (Enus)
2010-08-24Update GLSL shader sources to current $LicenseInfo$ standard.Nat Goodspeed
See https://wiki.lindenlab.com/wiki/License_Substitution for details.
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-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.
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden