summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-03-18MergeEli Linden
2010-03-18CT-575 DA translation for beta 5 new fileEli Linden
2010-03-18CT-575 DA translation for beta 5; JA linguisticEli Linden
2010-03-18Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-03-18EXT-5851 EXT-5422 crash on texture uploadNyx (Neal Orman)
Uploading texture caused the dummy avatar preview to initialize its joints twice removing extra call to initInstance removed the crash in LLJoint. Verified repro no longer crashes viewer. Code reviewed by Vir.
2010-03-18Implemented normal task EXT-5986 ([HARD CODED]. "You paid ...... L$... " - ↵Andrew Dyukov
message needs translation). String is server side hardcoded! - Moved strings to strings.xml - Parsed incoming "You paid" messages in code via regex --HG-- branch : product-engine
2010-03-18oops, type right before commit :(Richard Linden
2010-03-18EXT-6389 Fix for numbers in edit appearance not showing up on Mac.Dave Parks
2010-03-18mergeRichard Nelson
2010-03-18EXT-6347 - Crash when clicking on member's section of Oskar Linden FanclubRichard Nelson
reviewed by Callum
2010-03-18manual merge -r 10503Alexei Arabadji
2010-03-18MergeEli Linden
2010-03-18DE cycle8 translation for beta 5; FR linguisticEli Linden
2010-03-18fixed EXT-5630 “nearby chat flickers when top line fades out”,Alexei Arabadji
used reverse order to provide correct z-order and avoid toast blinking caused by z-reordering; reviewed by Vadim at https://codereview.productengine.com/secondlife/r/57/
2010-03-18(EXT-5982) [FRAGMENTATION] L$ kaufen window (Buy L$)Sergei Litovchuk
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/56/ --HG-- branch : product-engine
2010-03-18mergeMike Antipov
--HG-- branch : product-engine
2010-03-18set default viewer window size to 1024x738 EXT-4820 [NUX] Viewer dimensions ↵Igor Borovkov
on first-run Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/69/ --HG-- branch : product-engine
2010-03-18Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Xiaohong Bao
2010-03-18Done normal task EXT-6290 ([TRUNCATION] Block List - type shown after name ↵Mike Antipov
is truncated when the name is long. need 'en' xui rework) * Changed the way blocked items are shown in the list. For now they are separated on two columns: Name & Type. If Name is too long it is shown truncated (with ...) * As result remove deprecated methods from LLMute to concatenate its name & type and to extract name & type from the such concatenated string. * reduce include dependence from llmutelist.h --HG-- branch : product-engine
2010-03-18fixed EXT-6092 [crashhunters] Crash in LLFlatListView::selectItemPairIgor Borovkov
turned off commit on focus lost for the filter editor (Panel Places) in the code Reviewed by Mike at https://codereview.productengine.com/secondlife/r/63/ --HG-- branch : product-engine
2010-03-18Fixed major bug EXT-2707 - Coalesced objects do not show the proper icon in ↵Dmitry Zaporozhan
inventory. Added new icon for multi-objects. New icon is used in inventory, object inventory and buy floater. New icon can not be used in Group Notices because server does not send enough info in GroupNoticesListReply. --HG-- branch : product-engine
2010-03-18mergeIgor Borovkov
--HG-- branch : product-engine
2010-03-18mergeYuri Chebotarev
--HG-- branch : product-engine
2010-03-18working on EXT-5839 Creating a new wearable ...Yuri Chebotarev
some strings for localization --HG-- branch : product-engine
2010-03-18mergeIgor Borovkov
--HG-- branch : product-engine
2010-03-18mergeIgor Borovkov
--HG-- branch : product-engine
2010-03-18mergeIgor Borovkov
--HG-- branch : product-engine
2010-03-18Backed out changeset 0305673fe81e EXT-4820 [NUX] Viewer dimensions on first-runIgor Borovkov
--HG-- branch : product-engine
2010-03-18Backed out changeset f4c0761897c6 EXT-4820([NUX] Viewer dimensions on ↵Igor Borovkov
first-run) by which "moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux." --HG-- branch : product-engine
2010-03-18Backed out changeset 2624e0d8b6f4Igor Borovkov
--HG-- branch : product-engine
2010-03-18automated merge viewer2.0->viewer2.0Loren Shih
2010-03-18Updates for normal task EXT-6267 ([TRUNCATION] [EN XUI REWORK] - Side panel, ↵Mike Antipov
profiles: the teleport button is truncated. need 'en' xui designer rework) * 'en/panel_profile.xml' was redesigned. Assuming that 'de' locale doesn't have width overridden: ** added ellipses to buttons' labels to get possibility found truncation easier (except for IM button) ** reduced distance between buttons ** reduced padding from left/right sides to 1 px But there are still issue in two locales: 'es' for "add friend" 'pt' for "teleport" These buttons can not be shown properly with default widths. Note: 'de' & 'fr' locales have overridden width (not removed in the patch) --HG-- branch : product-engine
2010-03-18Low task (EXT-6261) [HARD CODED] Abuse Report: After sending an abuse ↵Sergei Litovchuk
report, there is a popup window stating that the report is sent/uploaded. The window isn´t localized. - Removed hardcoded string. Reviewed by Richard Nelson https://codereview.productengine.com/secondlife/r/23/ --HG-- branch : product-engine
2010-03-18EXT-6321 -- clicking on an event in the main map now invokes the event ↵Kent Quirk
details floater instead of trying to do a search for the event.
2010-03-18Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-03-17mergeRichard Nelson
2010-03-17fix for radio item not being selected after picking internal browserRichard Nelson
reviewed by Callum
2010-03-17VWR-18199 en_xui_changeEli Linden
2010-03-17FR linguistic; JA cycle8 translation for beta 5Eli Linden
2010-03-18[SHOWSTOPPER] Fix for (EXT-4704) Add maturity icons to Prefs -> General and ↵Sergei Litovchuk
(EXT-4705) Show maturity icon on Region/Estate tab. - Made changes to combobox onItemSelected() to fix (EXT-6269) typing a location into the nav bar always sends you to the first location you typed in. - Replaced LLIconsComboBox pointers with base class pointers LLComboBox. Reviewed by Richard Nelson https://codereview.productengine.com/secondlife/r/29/ --HG-- branch : product-engine
2010-03-17fix for EXT-6420: crash at LLImageRaw::LLImageRaw [secondlife-bin ↵Xiaohong Bao
llimage.cpp:271]
2010-03-17MergeEli Linden
2010-03-17VWR-17383 en_xui_changeEli Linden
2010-03-18Related to EXT-5986 ([HARD CODED]. "You paid ...... L$... " - message needs ↵Andrew Dyukov
translation)- removed unnecessary symbol in xml which was occasionally introduceded in 10453:cbac8ca300e0. --HG-- branch : product-engine
2010-03-18Partial fix for EXT-5986 ([HARD CODED]. "You paid ...... L$... " - message ↵Andrew Dyukov
needs translation) - only changes to strings.xml are commited to make sure they make their way to localization. Code changes are to follow. Discussed at https://codereview.productengine.com/secondlife/r/55/ --HG-- branch : product-engine
2010-03-17EXT-6252 : "Duplicate items (not links) in inventory are both displayed in ↵Loren Shih
bold as (worn) when only one is actually worn" Simple special-case fix for this specific issue, although I added a comment to llwearablelist.h that eventually the whole LLWearableList class will need some redesign. Core issue is that you can have multiple itemIDs pointing to the same assetID and LLWearableList doesn't account for this possibility during lookup-wearable-by-assetID operations.
2010-03-17mergePalmer Truelson
2010-03-17EXT-6419 Adding comma to viewer stats texture time outputPalmer Truelson
2010-03-17more for lltexturecache.cpp: fix the crash due to deleting the entries ↵Xiaohong Bao
header file after clearing the texture cache.
2010-03-17MergeEli Linden