summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-03-16Manual merge from default branch.Vadim Savchuk
Resolved conflicts in: * merging indra/newview/llpanelpick.cpp * merging indra/newview/llviewermessage.cpp * merging indra/newview/skins/default/xui/en/strings.xml --HG-- branch : product-engine
2010-03-16fixed EXT-4820 [NUX] Viewer dimensions on first-runIgor Borovkov
changed first run window height from 768 to 738 Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/38/ --HG-- branch : product-engine
2010-03-16Fixed normal task EXT-6025 - [HARD CODED] Side Bar : "Save Pick" - "Pick" is ↵Dmitry Zaporozhan
in EN (Save [WHAT]) Removed unused hardcoded strings, replaced "Save [WHAT]" with simple "Save Pick" as it's the only label needed for this button. Reviewer by Kent Quirk https://codereview.productengine.com/secondlife/r/28/ --HG-- branch : product-engine
2010-03-16Fixed normal task EXT-6282 - [TRANSLATED BUT IN EN]? - System message when ↵Dmitry Zaporozhan
receiving inventory offers: The item term needs to be localized Localized asset type names will be taken from strings.xml. Reviewed by Mike Antipov https://codereview.productengine.com/secondlife/r/15/ --HG-- branch : product-engine
2010-03-16fixed showstopper EXT-6289 (Clicking the plus button in the Places side ↵Igor Borovkov
panel only lets you add landmarks not folders) - PLUS button works as GEAR button and PLUS button on inventory panel (show context menu on click) - "Add a folder" menu item is always enabled (except for received folder) - clicking "Add a folder" menu item creates a folder in My Landmarks tab no matter what has been selected in the Places panel before Reviewed by Mike at https://codereview.productengine.com/secondlife/r/10/ --HG-- branch : product-engine
2010-03-16automated merge viewer2.0->viewe2.0Loren Shih
2010-03-16EXT-6013 Normal [HARD CODED] - Group Invitation, Group Roles: The group ↵Yuri Chebotarev
roles need to be localized reviwed https://codereview.productengine.com/secondlife/r/22/ --HG-- branch : product-engine
2010-03-16fix for normal EXT-6354 [HARD CODED] - Inventory, Filter-popup: Title isnґt ↵Yuri Chebotarev
localized reviwed https://codereview.productengine.com/secondlife/r/35/ --HG-- branch : product-engine
2010-03-16mergeYuri Chebotarev
--HG-- branch : product-engine
2010-03-16EXT-5989 [HARD CODED]. ".... paid you...... L$... " - message needs translationYuri Chebotarev
Reviwed https://codereview.productengine.com/secondlife/r/13/ --HG-- branch : product-engine
2010-03-16fixed EXT-6322 [NAMELESS XUI STRING] Nearby Media> Detail window - "Nearby ↵Igor Borovkov
Media" "Show:" and "On other Avatars" fixed "name" attributes Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/37/ --HG-- branch : product-engine
2010-03-16fixed EXT-6363 [HARD CODED] "Login Failed." is hardcodedIgor Borovkov
moved out "Login failed." to strings.xml Reviewed by Q at https://codereview.productengine.com/secondlife/r/27/ --HG-- branch : product-engine
2010-03-16Fixed bug EXT-6007 ([STRING IN EN] - While loading Second Life several ↵Vadim Savchuk
messages need to be localized). Reviewed by Richard: https://codereview.productengine.com/secondlife/r/31/ --HG-- branch : product-engine
2010-03-16Implemented normal task (EXT-6251) [HARD CODED]? Side bar: Landmarks > + ↵Sergei Litovchuk
button > Create Landmark > Landmark location dropdown > Landmarks/Japanese. Normal task (EXT-6251) [HARD CODED]? Side bar: Landmarks > + button > Create Landmark > Landmark location dropdown > Landmarks/Japanese. Reviewed by Richard Nelson https://codereview.productengine.com/secondlife/r/32/ --HG-- branch : product-engine
2010-03-16Fixed critical bug EXT-6318 [TRUNCATION] [EN XUI REWORK] - Talk button is ↵Mike Antipov
truncated "Sprechen". need xui designer to widen it by some 10 pixels * restored Speak button shrink feature * redesigned Speak button to accommodate label in 'de' locale ** made it wider to 5 px ** made label left-aligned ** set left padding to 12px Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/36/ --HG-- branch : product-engine
2010-03-15MergeEli Linden
2010-03-15EXT-6367: Can't delete non-links from COFLoren Shih
EXT-6372 : Can waer non-links in COF Some minor changes to account for non-link items appearing in the COF (non-links shouldn't appear in COF, but this can happen due to bugs or 1.23 usage). First fix allows for these items to be deleted. Second fix ignores these items from being processed/worn.
2010-03-15ES linguistic; PT adding 4 missing strings from set4Eli Linden
2010-03-15EXT-6010 apperance reverts to an old outfit while attempting to wear new outfitNyx (Neal Orman)
Removing log spam before pushing to main branch. change is de minimis. -Nyx
2010-03-15Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-03-15EXT-6010 Appearance reverts to an old outfit while attempting to wear new outfitNyx (Neal Orman)
Added code to suppress local composite updates while wearables are loaded. This makes sure that we don't update your appearance until all your wearables are added to gAgentWearables. Hackish for 2.0, but will be inherently better for 2.1 code reviewed by vir.
2010-03-15Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-03-15PE merge.Tofu Linden
2010-03-15mergeYuri Chebotarev
--HG-- branch : product-engine
2010-03-15Fixed normal bug (EXT-5834) Inventory SP: context menu for empty search ↵Sergei Litovchuk
result contain inappropriate items. - Fixed folder_view and inventory_panel resizing in LLFolderView::arrange() when all visible items are filtered out. This fixed context menu for "Search" SLURL in Places->My Landmarks. - Added check for visible items to display correct context menu when right-clicking on "Search" SLURL for empty search results in any inventory panel. Reviewed by Leyla Farazha https://codereview.productengine.com/secondlife/r/14/ --HG-- branch : product-engine
2010-03-15fix for EXT-5989 [HARD CODED]. ".... paid you...... L$... " - message needs ↵Yuri Chebotarev
translation --HG-- branch : product-engine
2010-03-15Fixed normal task EXT-6018 - [TRANSLATED BUT IN EN] "Save" button on notecardDmitry Zaporozhan
Removed deprecated string to resolve duplicated names(string.save and button.save). Reviewed by Callum Prentice https://codereview.productengine.com/secondlife/r/12/ --HG-- branch : product-engine
2010-03-15Fixed normal task EXT-6024 - [TRANSLATED BUT IN EN] Side Bar > Edit Pick - ↵Dmitry Zaporozhan
"(will update after save)" Replaced hardcoded string with xml string. Reviewed by Leyla Farazha https://codereview.productengine.com/secondlife/r/8/ --HG-- branch : product-engine
2010-03-15Fixed normal task EXT-6260 - [NAMELESS STRING] - Menu Preferences, Tab Chat: ↵Dmitry Zaporozhan
Show IMs in: and (requires restart) need to be localized (panel_preferences_chat.xml) Added widget missing names to make localization tool work. Reviewed by Callum Prentice https://codereview.productengine.com/secondlife/r/7/ --HG-- branch : product-engine
2010-03-12ES missing strings from set4-6; linguisticEli Linden
2010-03-12MergeEli Linden
2010-03-12linguisticEli Linden
2010-03-12EXT-2180 final linguistic edits of set1 and set6b by NovellaEli Linden
2010-03-12(for B5) Fix for EXT-5823 "Include language in user-agent string" ↵Callum Prentice
(implemented via JavaScript - not in ua string) (for B5) Fix for EXT-5314 "Inworld Browser blanks out at credit card entry" Note: also includes an update to install.xml that points to a new version of LLQtWebKit that is required for these fixes
2010-03-12New linux build of llqtwebkit.Monroe Linden
Also, disabled LL_QTWEBKIT_USES_PIXMAPS define in media_plugin_webkit.cpp as the QPixmap changes have been backed out of the llqtwebkit build for now.
2010-03-12EXT-5983 manual fix for changed EN root element name= (VLT bug; didn't flag ↵Eli Linden
change before)
2010-03-12undid change for VLT testEli Linden
2010-03-12temp test VLT functionality on root element name changeEli Linden
2010-03-12EXT-5988Eli Linden
2010-03-12MergeEli Linden
2010-03-12linguisticEli Linden
2010-03-12Fix for EXT-6336 Minor memory leak in LLFontRegistry::createFontAimee Linden
Reviewed by: Tofu
2010-03-12PE mergeTofu Linden
2010-03-12completed EXT-6305 (Remove "ScriptToast" notification in xui/en and all ↵Igor Borovkov
localizations) just cleaned up notifications.xml reviewed by Richard and Tofu at https://codereview.productengine.com/secondlife/r/1/ --HG-- branch : product-engine
2010-03-12fixed EXT-3607 (Cancelling a Land Sale to Specific Person Allows Land to be ↵Igor Borovkov
Set For Sale to Anyone Briefly) added additional check so that "for sale to anyone" text is shown only when a parcel is on sale reviewed by Richard at https://codereview.productengine.com/secondlife/r/4/ --HG-- branch : product-engine
2010-03-11MergeEli Linden
2010-03-11VWR-18254 en_xui_changeEli Linden
2010-03-11mergeBrad Payne (Vir Linden)
2010-03-11For EXT-5333: Bodyparts missing from appearance and COF. Recovered wearables ↵Brad Payne (Vir Linden)
were failing to get added correctly due to wrong timeout logic. Reviewed by Nyx.
2010-03-11linguistic changesEli Linden