summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterwebcontent.cpp
AgeCommit message (Collapse)Author
2024-05-22Fix line endlingsAnsariel
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
# Conflicts: # autobuild.xml # indra/cmake/CMakeLists.txt # indra/cmake/GoogleMock.cmake # indra/llaudio/llaudioengine_fmodstudio.cpp # indra/llaudio/llaudioengine_fmodstudio.h # indra/llaudio/lllistener_fmodstudio.cpp # indra/llaudio/lllistener_fmodstudio.h # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/llaudio/llstreamingaudio_fmodstudio.h # indra/llcharacter/llmultigesture.cpp # indra/llcharacter/llmultigesture.h # indra/llimage/llimage.cpp # indra/llimage/llimagepng.cpp # indra/llimage/llimageworker.cpp # indra/llimage/tests/llimageworker_test.cpp # indra/llmessage/tests/llmockhttpclient.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llfontfreetype.cpp # indra/llui/llcombobox.cpp # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.h # indra/llui/lllineeditor.cpp # indra/llui/lllineeditor.h # indra/llui/lltextbase.cpp # indra/llui/lltextbase.h # indra/llui/lltexteditor.cpp # indra/llui/lltextvalidate.cpp # indra/llui/lltextvalidate.h # indra/llui/lluictrl.h # indra/llui/llview.cpp # indra/llwindow/llwindowmacosx.cpp # indra/newview/app_settings/settings.xml # indra/newview/llappearancemgr.cpp # indra/newview/llappearancemgr.h # indra/newview/llavatarpropertiesprocessor.cpp # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llbreadcrumbview.cpp # indra/newview/llbreadcrumbview.h # indra/newview/llbreastmotion.cpp # indra/newview/llbreastmotion.h # indra/newview/llconversationmodel.h # indra/newview/lldensityctrl.cpp # indra/newview/lldensityctrl.h # indra/newview/llface.inl # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llfloateremojipicker.h # indra/newview/llfloaterimsessiontab.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/llfloaterprofiletexture.h # indra/newview/llgesturemgr.cpp # indra/newview/llgesturemgr.h # indra/newview/llimpanel.cpp # indra/newview/llimpanel.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryclipboard.cpp # indra/newview/llinventoryclipboard.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorygallery.cpp # indra/newview/lllistbrowser.cpp # indra/newview/lllistbrowser.h # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofile.h # indra/newview/llpreviewgesture.cpp # indra/newview/llsavedsettingsglue.cpp # indra/newview/llsavedsettingsglue.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llurllineeditorctrl.cpp # indra/newview/llvectorperfoptions.cpp # indra/newview/llvectorperfoptions.h # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/macmain.h # indra/test/test.cpp
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-02-21Convert BOOL to bool in lluiAnsariel
2021-10-07SL-16024: Return shared_ptr from LLInstanceTracker::getInstance().Nat Goodspeed
It feels wrong to return a dumb LLInstanceTracker subclass* from getInstance() when we use std::shared_ptr and std::weak_ptr internally. But tweak consumers to use 'auto' or LLInstanceTracker::ptr_t in case we later revisit this decision. We did add a couple get() calls where it's important to obtain a dumb pointer.
2019-11-13SL-11964 Removed SL Share from the viewerAndreyL ProductEngine
2019-09-10Merged in lindenlab/viewer-releaseandreykproductengine
2019-06-21DRTVWR-493 LLViewerMedia to singletonandreykproductengine
2019-04-24SL-10994 Removed Facebook In-world SharingAndreyL ProductEngine
SL-11024 Fixed Twitter connect failure
2018-04-16MAINT-8453 FIXED The "Reload page" button is displayed for some time after ↵maxim_productengine
opening media browser
2018-02-12MAINT-8276 Arrows 'Navigate back' and 'Navigate forward' have wrong stateAndrey Kleshchev
2016-08-20MAINT-6663 [Win LibVLC] test video buttons still appearing in searchAndreyL ProductEngine
2016-07-22Polish web content floater - rename to reflect it now does all media. remove ↵Callum Linden
developer options when Develop menu closed. start at google home page by default.
2016-05-23Automated merge with tip of viewer-releasecallum_linden
2016-05-10working test button in web browser floater - video invertedcallum_linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2014-09-05MAINT-3440 (Refix) Viewer freezes and not responding after trying to open 5 ↵callum_linden
new media browsers tabs directed to yahoo.com link
2014-06-24Pull downstream viewer-tiger and become version 3.7.11simon
2014-06-24Merge viewer-release and become version 3.7.11simon
2014-06-18Merge downstream codesimon
2014-06-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-06-17Merge viewer-release and become version 3.7.9simon
2014-05-15MAINT-3440 FIX Viewer freezes and not responding after trying to open 5 new ↵Callum Prentice
media browsers tabs directed to yahoo.com link
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-07Merge downstream version 3.7.8 codesimon
2014-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile ↵Merov Linden
errors
2014-03-03MAINT-2902 FIXED Browser secure session indicator should be prominentmaksymsproductengine
2014-02-24mergeBrad Payne (Vir Linden)
2014-02-19Merge with releaseRichard Linden
2014-02-10Pull merge ACME-1317 emergency fixMerov Linden
2014-02-11Hack to fix ACME-1317Cho
2013-12-12Pull merge from lindenlab/viewer-releaseMerov Linden
2013-12-05mergeBrad Payne (Vir Linden)
2013-12-04ACME-1043 : Fixed! Added an argument to force a clean full feature browser ↵Merov Linden
window in some situations
2013-12-04ACME-1043 : WIP : Add an argument to open trusted content with js and other ↵Merov Linden
enabled options, bypassing prefs
2013-11-20BUILDFIX: forgot template parameterRichard Linden
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-06merge with releaseRichard Linden
2013-11-06separated web floaters for Facebook, Flickr, and Twitter to fix ACME-1151Cho
2013-11-02added Flickr floater for ACME-1136, ACME-1137, ACME-1138, ACME-1140, and ↵Cho
ACME-1141
2013-10-29Merge viewer-release => sunshine-internalDon Kjer
2013-09-26ACME-946 : Do not force set the focus on the web element, that messes things ↵Merov Linden
up badly...
2013-10-23Merge latest viewer-release with FBCsimon
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-02ACME-796 : Do not flip the fbc state to failure while connecting through web ↵Merov Linden
browser. Handle the dismiss case as best as possible.
2013-08-02MAINT-2902 FIXED Browser secure session indicator should be prominentmaksymsproductengine
2013-07-23ACME-734 : Fix issues with the lock icon when editing the address bar. ↵Merov Linden
Generalize the secure browsing UI.
2013-07-22ACME-734 : Fix: Do not log empty URLs, refocus on page if the focus was thereMerov Linden
2013-07-21ACME-734 : Fix : Factorize and clean up web browsing address, log and ↵Merov Linden
history code
2013-07-19ACME-734 : Fix : Feed browsing history but without the query partMerov Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 04:05:36 +0000