7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
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
cb8df37e91
FIRE-31068 New Guidebook UI adjustments
...
Synchronized llfloaterwebcontent.cpp with the Lab's one around the lines where QAMode was checked; It's always possible to just load the test URL manually anyway
2021-07-16 21:46:23 +02:00
a154630ecd
Merge 494-maint-wassail
2019-11-19 21:51:54 +01:00
7ffe8d0a51
SL-11964 Removed SL Share from the viewer
2019-11-13 05:32:05 +02:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
37eb735ba7
Merged in lindenlab/viewer-release
2019-09-10 20:30:25 +03:00
8369276a49
DRTVWR-493 LLViewerMedia to singleton
2019-06-21 20:55:39 +03:00
8dfb7d571e
Merge viewer-neko
2019-04-24 21:05:58 +02:00
ba90f3a8e4
SL-10994 Removed Facebook In-world Sharing
...
SL-11024 Fixed Twitter connect failure
2019-04-24 02:24:42 +03:00
7e7984fcfd
Merge viewer-neko
2018-05-01 18:42:59 +02:00
70bc436487
Merge viewer-neko
2018-02-12 22:28:26 +01:00
2714ff8f25
MAINT-8276 Arrows 'Navigate back' and 'Navigate forward' have wrong state
2018-02-12 19:27:09 +00:00
d7a0835432
Merge.
2016-09-26 21:12:34 +02:00
3d9c39c77c
MAINT-6663 [Win LibVLC] test video buttons still appearing in search
2016-08-20 12:53:03 +03:00
b547aeef03
Merge with https://bitbucket.org/lindenlab/viewer-vlc
2016-08-01 16:15:47 +02:00
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
e982c273fd
Merge with viewer-release-vlc
2016-05-29 19:27:00 +02:00
05fcb7c812
Automated merge with tip of viewer-release
2016-05-23 16:50:56 -07:00
bceafa5062
working test button in web browser floater - video inverted
2016-05-10 17:16:24 -07:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
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
e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
48fc17d6e1
Merge LL V3.7.16
2015-01-14 17:36:30 +01:00
a1fd8230bf
Merge LL V3.7.12
2015-01-12 17:56:50 +01:00
1f465086c0
Merge LL V3.7.10
2015-01-11 18:40:22 +01:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
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
05319e6c94
Pull downstream viewer-tiger and become version 3.7.11
2014-06-24 10:06:28 -07:00
527f180dd7
Merge viewer-release and become version 3.7.11
2014-06-24 09:47:21 -07:00
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
c4c8debfc2
Pull merge from lindenlab/viewer-release
2014-06-17 11:12:27 -07:00
592024b580
Merge viewer-release and become version 3.7.9
2014-06-17 10:40:42 -07:00
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
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
dc4c184696
Merge downstream version 3.7.8 code
2014-05-07 13:19:05 -07:00
8dae4bc222
Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors
2014-05-06 18:21:04 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
100b0f48a9
MAINT-2902 FIXED Browser secure session indicator should be prominent
2014-03-03 20:13:09 +02:00
948c0c559d
merge
2014-02-24 11:33:41 -05:00
ef591d280e
Merge with release
2014-02-19 12:32:08 -08:00
4c2102056c
Merge LL 3.7.1
2014-02-14 13:18:26 -08:00
a5add351e8
Pull merge ACME-1317 emergency fix
2014-02-10 21:03:18 -08:00
8d0f7fe571
Hack to fix ACME-1317
2014-02-11 00:09:59 +00:00
a4f121f065
Pull merge from lindenlab/viewer-release
2013-12-12 09:03:21 -08:00
744cf6be8d
merge
2013-12-05 10:39:35 -05:00
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
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
3d35f00d63
BUILDFIX: forgot template parameter
2013-11-20 18:16:54 -08:00
Ansariel