summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-08-31CT-575 WIP FR linguisticEli Linden
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-31MergeAimee Linden
2010-08-29pull changes for EXT-8668 and EXT-7901Oz Linden
2010-08-29merge up to latest viewer-developmentOz Linden
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-26Remove redundant panel_classified.xml XUI file.Aimee Linden
2010-08-26re-merge change from Thickbrick (minor collisions with changes from ↵Oz Linden
viewer-public merge)
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-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-25VWR-20710 : Sit anywhere, port of SG2.x SNOW-610 patchMerov Linden
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
2010-08-24Final(???) merge from viewer-release to viewer-public.Tofu Linden
2010-08-24Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-08-24EXT-7951 RESTORED IN VIEWER-DEVELOPMENT REPO (Mini-Location panel appearance ↵Paul Guslisty
design issues) - Added callback on show\hide Mini Location Panel event. This callback sets proper initial minimized position depending on state (shown or hidded) Mini Location Panel. Also callback shifts vertically already minimized floaters so that they don't overlap Mini Location Panel Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/851/ --HG-- branch : product-engine
2010-08-24EXT-7878 FIXED (Corrupted vertical scroll bar appears on 'Edit Outfit' panel ↵Paul Guslisty
if height of 'Add More' panel was changed) - Increased panel's min height Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/874/ --HG-- branch : product-engine
2010-08-24EXT-8672 FIXED ([HARD CODED] ALL LANGS The word \"Saved\" is hard coded, in ↵Paul Guslisty
the long timestamp displayed in IM when user is offline) - Created a string with a time stamp parameter and added it to the strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/872/ --HG-- branch : product-engine
2010-08-24EXT-8362 FIXED ([TRUNCATION] IT login screen - truncation in location box)Paul Guslisty
- Increased combo box width and removed unnecessary parameters wirth from other locales Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/871/ --HG-- branch : product-engine
2010-08-23fix for EXT-8101: [crashhunters] crash in LLVOSky::calcAtmospherics()Xiaohong Bao
2010-08-23Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao
2010-08-23fix for EXT-8730: crash at llrender/llimagegl.cpp(157) : error ERROR: ↵Xiaohong Bao
checkTexSize: wrong texture size and discard level: width: 512 Height: 512 Current Level:
2010-08-23added a toggle "LLGLManager::mDebugGPU" for debugging certain CPUs.Xiaohong Bao
added more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-23VWR-20899 FIXED Minor potential memory leak in LLFlatListView::addItemAimee Linden
2010-08-21CID-370Aimee Linden
Checker: UNINIT_CTOR Function: LLVivoxProtocolParser::LLVivoxProtocolParser() File: /indra/newview/llvoicevivox.cpp
2010-08-21VWR-20752 (SNOW-586) Align planar-mapped textures across different faces.Thickbrick Sleaford
Port of svn changset 3458 from Snowglobe, with minor tweaks.
2010-08-20fix gcc build error.Tofu Linden
2010-08-20merge from PE's viewer-trunkTofu Linden
2010-08-20merge from viewer-releaseTofu Linden
2010-08-20VWR-20847 (SNOW-543/SNOW-517) FIXED Linux packaging fixes.Aimee Linden
2010-08-19EXT-8668 Added da and pl langs to the windows installerMark Palange (Mani)
2010-08-19Merge from default branch. Fixed gcc build.Vadim Savchuk
--HG-- branch : product-engine
2010-08-19EXT-8697 FIXED Disabled "Cut" context menu item for folders in 'My Landmarks'.Sergei Litovchuk
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/867/. --HG-- branch : product-engine
2010-08-19EXT-8658 FIXED Made only online participants of Adhoc chat to be shown shown ↵Andrew Dyukov
in Recent Tab. Used previously commented code which adds only online paricipants instead of current code that added all. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/860/ --HG-- branch : product-engine
2010-08-19EXT-8635 FIXED Replaced "no matches found" with "Loading..." in the My ↵Andrew Dyukov
Outfits tab. Set no items text to "Loading..." when creating the wearable items list and to "There are no items in this outfit" when category is complete. "Outhfit" is there, because wearable items list nay be empty only for them. This string was introduced, because the only situation when there are no items shown in outfit tab is for empty outfit- because even when applying filter either all items from outfit will be shown or outfit tab won't be shown at all. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/865/ --HG-- branch : product-engine
2010-08-18fixed for EXT-8963: investigate if Advanced > Run Multiple Threads should be on.Xiaohong Bao
Removed "Run Multiple Threads" from the menu because we are not using it.
2010-08-18Automated merge with ssh://hg.lindenlab.com/q/viewer-releaseXiaohong Bao