summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2010-03-18Merge of PE merge with extra headKent Quirk
2010-03-18Fix for EXT-6304: Shared media cookies cannot be deleted via PreferencesMonroe Linden
Added static member functions to LLViewerMedia: clearAllCookies(), clearAllCaches(), setCookiesEnabled(), and setProxyConfig(). These iterate through all loaded instances and send appropriate messages. Also added a hack to clearAllCookies() to delete cookie files for all accounts, which should serve until we centralize cookie storage. Made LLViewerMedia set the proxy config properly when creating new instances. Callum is adding code to do something similar with the cookies enabled flag in a separate commit. Removed get_web_media from llfloaterpreference.cpp and reworked everything that used it to use the new LLViewerMedia functions instead. Reviewed by Callum at http://codereview.lindenlab.com/838003.
2010-03-18MergeKent Quirk
2010-03-18VWR-18276 en_xui_changeEli Linden
2010-03-18MergeKent Quirk
2010-03-18EXT-6466 "Move "Enable Cookies" checkbox...", EXT-6402 "Add feature to ↵Callum Prentice
disable Web plugins via prefs" and EXT-6401 "Add feature to disable Javascript via prefs" Apologies for the multiple commit of Jiras - these changes are closely related and impossible to commit deparately Reviewed by Monroe
2010-03-18EXT-5923 - Change play/pause behavior of Nearby Media affordanceRichard Linden
reviewed by BenGlenn
2010-03-18MergeKent Quirk
2010-03-18mergeRichard Linden
2010-03-18EXT-6402 - Add support for enable/disable of Plugins (Flash) within WebKit ↵Richard Linden
to Viewer Prefs fixed radio item values so they work in true and false cases for UseExternalBrowser reviewed by Callum
2010-03-18VWR-17631 en_xui_changeEli Linden
2010-03-18EXT-5849 - [crashhunters] Crash in LLView::drawChildren()Richard Linden
attempted fix by removing gesture combo popup lists from floater view holder reviewed by Leyla
2010-03-18merge from hotfix to viewer-2-0 and resolve conflictsKent Quirk
2010-03-18FR cycle8 translation for beta5Eli Linden
2010-03-18linguisticEli Linden
2010-03-18mergeRichard Linden
2010-03-18EXT-6426 - Role titles with UTF-8 characters prevent login when enabledRichard Linden
reviewed by Monroe
2010-03-18fixing linux build errors from bao's checkin for EXT-6093Nyx (Neal Orman)
viewer wouldn't compile under linux, due to gcc being paranoid about a few things. Fixed them up and got them reviewed. Code reviewed by bao.
2010-03-18Related to EXT-5909 (Accepted/declined inventory offer shouldn't spawn chiclet).Andrew Dyukov
- Removed unnecessary string in strings.xml and substituted it in code with existing one. --HG-- branch : product-engine
2010-03-18Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
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