6ecb0278db
Fix OpenSim build
2024-07-09 09:17:15 +02:00
088cc2ea35
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
2024-07-09 02:25:42 +02:00
14af436ce5
Fix build
2024-06-21 20:51:02 +02:00
45ab5c68ee
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llrender/llgl.h
# indra/newview/fspanelface.cpp
# indra/newview/fspanelface.h
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llheroprobemanager.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewercamera.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvocache.cpp
# indra/newview/vjlocalmesh.cpp
2024-06-21 19:58:00 +02:00
64cb25cb5f
Include all VRAM settings in system information
2024-06-18 11:13:52 +02:00
a17fd2352a
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
0ecfbc3de9
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# 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/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# 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/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
2024-05-16 14:10:55 +02:00
7befacf8a3
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llxml/llcontrol.cpp
2024-05-13 22:24:36 +02:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
85ae4ed95b
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llxml/llcontrol.cpp
# indra/llxml/llxmlnode.cpp
# indra/llxml/llxmltree.h
# indra/newview/CMakeLists.txt
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreastmotion.cpp
# indra/newview/llfloaterauction.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
2024-03-08 16:56:01 +01:00
b71c7f37ea
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llagent.cpp
# indra/newview/llagent.h
# indra/newview/llagentcamera.cpp
# indra/newview/llagentcamera.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llattachmentsmgr.cpp
# indra/newview/llattachmentsmgr.h
# indra/newview/llavataractions.cpp
# indra/newview/llcallingcard.cpp
# indra/newview/llcompilequeue.cpp
# indra/newview/llcontrolavatar.h
# indra/newview/lldirpicker.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolalpha.h
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfasttimerview.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfloateravatarpicker.cpp
# indra/newview/llfloaterbeacons.cpp
# indra/newview/llfloaterbvhpreview.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llfloaterdisplayname.cpp
# indra/newview/llfloatergotoline.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
# indra/newview/llfloaterscriptdebug.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llfloatertools.cpp
# indra/newview/llfloatertools.h
# indra/newview/llfloateruipreview.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgesturemgr.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llhudeffectlookat.cpp
# indra/newview/llhudeffectlookat.h
# indra/newview/llhudicon.cpp
# indra/newview/llhudmanager.cpp
# indra/newview/llhudtext.cpp
# indra/newview/llhudtext.h
# indra/newview/llimprocessing.cpp
# indra/newview/llimview.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodel.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllogininstance.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llmodelpreview.h
# indra/newview/llmutelist.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
# indra/newview/llnotificationlistitem.cpp
# indra/newview/lloutputmonitorctrl.cpp
# indra/newview/llpanelcontents.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelexperiencepicker.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroupnotices.cpp
# indra/newview/llpanelgrouproles.cpp
# indra/newview/llpanellandaudio.cpp
# indra/newview/llpanellandmarks.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelobject.cpp
# indra/newview/llpanelobject.h
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaces.cpp
# indra/newview/llpanelpresetspulldown.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelsnapshot.h
# indra/newview/llpanelvolume.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llpreviewanim.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llpreviewnotecard.cpp
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llpreviewtexture.cpp
# indra/newview/llpreviewtexture.h
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsnapshotlivepreview.cpp
# indra/newview/llstartup.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturecache.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/lltoastimpanel.cpp
# indra/newview/lltoolbarview.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/lltoolface.cpp
# indra/newview/lltoolfocus.cpp
# indra/newview/lltoolgrab.cpp
# indra/newview/lltoolgun.cpp
# indra/newview/lltoolgun.h
# indra/newview/lltoolpie.cpp
# indra/newview/lltoolplacer.cpp
# indra/newview/lltoolselect.cpp
# indra/newview/lluploaddialog.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerfoldertype.cpp
# indra/newview/llviewerinput.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewermenu.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewerobjectlist.h
# indra/newview/llviewerparcelmgr.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerregion.h
# indra/newview/llviewershadermgr.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexlayer.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvoavatarself.h
# indra/newview/llvoiceclient.h
# indra/newview/llvosky.cpp
# indra/newview/llvosurfacepatch.cpp
# indra/newview/llvotree.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/llvowater.cpp
# indra/newview/llworld.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/llworldmipmap.cpp
# indra/newview/pipeline.cpp
2024-02-22 11:43:04 +01:00
6fdfa1c025
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-07-17 23:20:50 +02:00
142781dae7
actually expose used ram properly.
2023-07-09 01:23:46 +01:00
bdd6f81dec
Add some const because why not?
2023-05-08 19:12:39 +02:00
6353aef820
Add Firestorm team member badge
2023-05-08 19:00:35 +02:00
6b6b116fd4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2021-03-03 00:20:02 +01:00
9f9ae52e8f
Add detected VRAM to system info details
2020-10-25 21:58:28 +01:00
1a2b01706f
Add uses SIMD extension to system info details
2020-10-25 14:34:23 +01:00
8d1b6e0f3f
Update to system info details
2020-10-25 12:56:31 +01:00
9335eded97
Merge with viewer-vs2107
2019-12-08 17:18:43 +01:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
9337241cc7
Merge Firestorm LGPL
2019-06-20 09:48:19 +02:00
c4dc084f2f
Refactor this a bit
2019-06-19 16:49:19 +02:00
e95fc10271
INT-142 - add build number to 'Specify version' in Firestorm groupchats
...
Patch by Chaser Zaks
2019-06-18 16:28:59 -07:00
39d4bcb0dd
Add HiDPI info to support system info
2019-04-15 12:53:29 +02:00
9bca93b4ff
Get rid of new obsolete strnlen() implementation for Mac which should be available since 10.7 and 10.9 is required by now anyway
2018-12-04 00:59:48 +01:00
c8718dfa3f
Remove unused constant in FSData Xcode surprisingly didn't complain about yet and ditch BOOST_FOREACH
2018-12-04 00:44:41 +01:00
cf36d9d8bc
Include viewer version in FSData-provided settings defaults, so we don't need to provide an empty file to clear defaults set via a download for an old release
2018-12-01 02:50:26 +01:00
d32de5eeee
Fix a few FSData related issues:
...
* Use raw GET to prevent the HttpCoroHandler try to parse status 404 response bodies and complaining about invalid LLSD
* No need to check for status 304 response in downloadComplete() - 304 will result in failure callback being invoked
* Distinguish between status 304 (not modified) and other download failures
* Fix http_result node being written to grids.remote.xml file at startup
2018-06-13 17:04:38 +02:00
6c4d4efe12
Adjust sysinfo to include address size and the new Dullahan/CEF version
2018-03-21 20:09:11 +01:00
0c139fe5da
FIRE-22394: Allow QA to request sysinfo too
2018-03-14 19:25:17 +01:00
fd834b39d7
Fix Linux build
2017-12-06 17:15:16 +01:00
0f9af6462d
Allow showing random MOTDs during TP
...
Selection rules for MOTD:
* if main MOTD is defined, show this at login and during TPs
* if random MOTDs are defined and main MOTD not set, show a random MOTD
at login and every TP
* if event MOTD is defined, show event MOTD at login. For TPs, either
show main MOTD if defined, or show a random MOTD if defined
2017-12-06 09:46:16 +01:00
749d8f3004
Fix some typos
2017-12-04 23:28:40 +01:00
bfc76e44d8
Route FSData download error (which includes 304 - Not Modified) through processResponder() to load data from local file
2017-11-30 10:55:51 +01:00
14aa08d173
Fix some crude logic in FSData
2017-11-29 22:51:53 +01:00
409c001755
Fix FSData to download files only if there are newer versions on the server
2017-11-29 22:22:44 +01:00
4608aeb505
Transplant MAINT-7118 and fix some bad design on the way
2017-02-23 10:54:25 +01:00
e2919977d6
Merge viewer-lynx
2016-11-30 11:15:04 +01:00
f8ccbd53fd
Add CEF/VLC version to sysinfo.
2016-10-19 01:02:15 +02:00
12df60d4e1
Major overhaul of the asset blacklist floater:
...
* Use sorting persistance already available in LLScrollListCtrl and remove specific asset blacklist debug settings
* Add right-click context menu
* Draw stripes for alternating lines for easier reading
* Add missing "Close" button
* Add filter editor for searching for particular assets
* Properly format date based on localizable format string and show time as local time instead of UTC
* Renamed classes to better fit the Firestorm naming system
* Removed unused methods
2016-08-26 11:58:18 +02:00
676a178e18
FIRE-19956: Show temporarily blocked objects in blacklist floater so they can be removed; Based on a patch by Xenhat Liamano
2016-08-25 15:42:01 +02:00
9de9b58013
Add FSCoreHttpUtil to the project
2016-08-06 16:54:22 +02:00
5e785acff1
Integrate with fsdata
2016-07-12 00:20:54 +02:00
ee48856d77
Updated fsdata to work with coroutine http code.
2015-10-31 18:39:25 +01:00
c218e524b2
Merge - Step 1; Still enough to do.
2015-10-26 20:20:13 +01:00
1016e54d22
Pass-through notification payload data as payload and don't abuse the substitutions for it
2015-07-31 16:28:30 +02:00
83cd2e408f
Fix unsafe code in FSData and made reqsysinfo messages localizable
2015-07-31 15:28:22 +02:00
722ddc5d3a
Don't try to download removed scriptlibrary_lsl.xml via FSData
2015-07-28 13:55:05 +02:00
217e879c20
Linux: fstream has no constructor that takes a std::string.
2015-05-06 16:34:41 +02:00
Ansariel