Commit Graph

88 Commits (a070ca0d939356fa4b87deea0e5a395e40c76c3c)

Author SHA1 Message Date
Rye Mutt 49d60e0ded Reduce string temporaries from LLFloaterReg find/get 2024-07-01 22:24:32 -04:00
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Ansariel 1b67dd855c Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# 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-05-22 19:04:52 +02:00
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Ansariel a5261a5fa8 Convert BOOL to bool in llui 2024-02-21 03:00:25 +02:00
Nat Goodspeed 2cb09dd4a8 SL-16024: Return shared_ptr from LLInstanceTracker::getInstance().
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.
2021-10-07 11:53:45 -04:00
AndreyL ProductEngine 7ffe8d0a51 SL-11964 Removed SL Share from the viewer 2019-11-13 05:32:05 +02:00
andreykproductengine 37eb735ba7 Merged in lindenlab/viewer-release 2019-09-10 20:30:25 +03:00
andreykproductengine 8369276a49 DRTVWR-493 LLViewerMedia to singleton 2019-06-21 20:55:39 +03:00
AndreyL ProductEngine ba90f3a8e4 SL-10994 Removed Facebook In-world Sharing
SL-11024 Fixed Twitter connect failure
2019-04-24 02:24:42 +03:00
maxim_productengine 1bdf76dde7 MAINT-8453 FIXED The "Reload page" button is displayed for some time after opening media browser 2018-04-16 16:27:59 +03:00
Andrey Kleshchev 2714ff8f25 MAINT-8276 Arrows 'Navigate back' and 'Navigate forward' have wrong state 2018-02-12 19:27:09 +00:00
AndreyL ProductEngine 3d9c39c77c MAINT-6663 [Win LibVLC] test video buttons still appearing in search 2016-08-20 12:53:03 +03:00
Callum Linden 6f09cf76cd Polish web content floater - rename to reflect it now does all media. remove developer options when Develop menu closed. start at google home page by default. 2016-07-22 16:27:53 -07:00
callum_linden 05fcb7c812 Automated merge with tip of viewer-release 2016-05-23 16:50:56 -07:00
callum_linden bceafa5062 working test button in web browser floater - video inverted 2016-05-10 17:16:24 -07:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
callum_linden 2802a0e839 MAINT-3440 (Refix) Viewer freezes and not responding after trying to open 5 new media browsers tabs directed to yahoo.com link 2014-09-05 16:00:10 -07:00
simon 05319e6c94 Pull downstream viewer-tiger and become version 3.7.11 2014-06-24 10:06:28 -07:00
simon 527f180dd7 Merge viewer-release and become version 3.7.11 2014-06-24 09:47:21 -07:00
simon d760a6889d Merge downstream code 2014-06-18 19:02:25 -07:00
Merov Linden c4c8debfc2 Pull merge from lindenlab/viewer-release 2014-06-17 11:12:27 -07:00
simon 592024b580 Merge viewer-release and become version 3.7.9 2014-06-17 10:40:42 -07:00
Callum Prentice 704246c30f MAINT-3440 FIX Viewer freezes and not responding after trying to open 5 new media browsers tabs directed to yahoo.com link 2014-05-15 16:26:58 -07:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
simon dc4c184696 Merge downstream version 3.7.8 code 2014-05-07 13:19:05 -07:00
Merov Linden 8dae4bc222 Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors 2014-05-06 18:21:04 -07:00
maksymsproductengine 100b0f48a9 MAINT-2902 FIXED Browser secure session indicator should be prominent 2014-03-03 20:13:09 +02:00
Brad Payne (Vir Linden) 948c0c559d merge 2014-02-24 11:33:41 -05:00
Richard Linden ef591d280e Merge with release 2014-02-19 12:32:08 -08:00
Merov Linden a5add351e8 Pull merge ACME-1317 emergency fix 2014-02-10 21:03:18 -08:00
Cho 8d0f7fe571 Hack to fix ACME-1317 2014-02-11 00:09:59 +00:00
Merov Linden a4f121f065 Pull merge from lindenlab/viewer-release 2013-12-12 09:03:21 -08:00
Brad Payne (Vir Linden) 744cf6be8d merge 2013-12-05 10:39:35 -05:00
Merov Linden f5b356a7d4 ACME-1043 : Fixed! Added an argument to force a clean full feature browser window in some situations 2013-12-04 21:14:40 -08:00
Merov Linden a36c4f45b4 ACME-1043 : WIP : Add an argument to open trusted content with js and other enabled options, bypassing prefs 2013-12-04 18:02:04 -08:00
Richard Linden 3d35f00d63 BUILDFIX: forgot template parameter 2013-11-20 18:16:54 -08:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Cho 1a1826a4f7 separated web floaters for Facebook, Flickr, and Twitter to fix ACME-1151 2013-11-06 02:06:53 +00:00
Cho 0e71fb3c9d added Flickr floater for ACME-1136, ACME-1137, ACME-1138, ACME-1140, and ACME-1141 2013-11-02 01:50:17 +01:00
Don Kjer 7866356d77 Merge viewer-release => sunshine-internal 2013-10-29 13:20:18 +00:00
Merov Linden 796be733b3 ACME-946 : Do not force set the focus on the web element, that messes things up badly... 2013-09-26 16:17:54 -07:00
simon 64c5afa196 Merge latest viewer-release with FBC 2013-10-23 14:14:36 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Merov Linden 3527846196 ACME-796 : Do not flip the fbc state to failure while connecting through web browser. Handle the dismiss case as best as possible. 2013-08-02 19:25:10 -07:00
maksymsproductengine aec50ffdad MAINT-2902 FIXED Browser secure session indicator should be prominent 2013-08-02 20:12:55 +03:00
Merov Linden 6df15cb090 ACME-734 : Fix issues with the lock icon when editing the address bar. Generalize the secure browsing UI. 2013-07-23 15:31:36 -07:00
Merov Linden 9c97f4f5ef ACME-734 : Fix: Do not log empty URLs, refocus on page if the focus was there 2013-07-22 18:47:05 -07:00
Merov Linden f44d24fafb ACME-734 : Fix : Factorize and clean up web browsing address, log and history code 2013-07-21 13:02:55 -07:00