e78ac58683
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcorehttp/_httpoprequest.cpp
# indra/llcorehttp/httpoptions.cpp
2025-08-19 19:33:35 +02:00
e6286eddef
Really fix this now...
2025-07-08 02:22:33 +02:00
5a07012523
Make these const to allow optimizations
2025-07-07 20:37:48 +02:00
6ecb0278db
Fix OpenSim build
2024-07-09 09:17:15 +02:00
14af436ce5
Fix build
2024-06-21 20:51:02 +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
1c7952df8a
gcc does not like these to be static.
2024-03-13 13:03:19 +01: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
9b93864eb9
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfilepicker_mac.mm
# indra/newview/llinventorymodel.cpp
# indra/newview/llstartup.cpp
# indra/newview/llurldispatcher.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/strings.xml
2023-04-21 14:22:42 +02:00
06b56944af
Add some comment with example SLURL for "addgrid"
2022-11-14 12:34:02 +01:00
d149a3b782
FIRE-31628 Use OpenSim collision sounds when in OpenSim
2022-05-10 15:13:10 +01:00
01d644f95f
Splash page is https ready thanks to BUG-216465 being fixed
2021-09-02 19:36:36 +02:00
cbddc4a71b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-12 01:59:17 +02:00
ae0598e3f4
FIRE-30939 - remove legacy Inworldz URI support
2021-05-11 22:30:58 +01:00
4ec90e0320
Add "gridmanager" SLURL app command to add new grids to grid manager via SLURL
2021-05-04 23:26:50 +02:00
335e9e1363
Fix local variable scoping issue
2020-11-12 01:35:45 +00:00
926c4fecea
SUP-26198 - Grid list "freezes" when adding grid
2020-11-07 01:47:01 +00:00
face468d7b
FIRE-24068 support https grid info URIs
2020-11-07 01:23:18 +00:00
5fdcea0963
Exclude local grid file variable declaration if SINGLEGRID is defined
2018-09-30 21:32:55 +02:00
f4c2ed2103
Add build option to allow logging into a single grid only:
...
* Specify -DSINGLEGRID:BOOL=TRUE and -DSINGLEGRID_URI:STRING=<grid_uri> during configuration
* Only works for OpenSim build (Specify -DOPENSIM:BOOL=TRUE)
Changes compared to default version:
* Grid at <grid_uri> is set as main grid
* Grid selector on login screen is disabled
* Grid list download is disabled
* Grid list is ignored - grid data is always fetched on startup
* OpenSim panel from preferences is removed
* Grid selection via command line parameter is ignored
2018-09-30 21:29:26 +02:00
429ea6c37d
Fix grid manager to include last modified date in request where it apparently should and handle status 304 response properly (and internal server errors presumably as well)
2018-06-13 17:06:55 +02:00
24edb1e6ff
Minor fixes for previous commit
2017-09-30 19:01:47 +02:00
4ad7d4b750
Support for multiple currency solutions on a grid and across the hypergrid.
2017-09-20 16:00:25 -07:00
2aeb2d2e65
Merge Firestorm LGPL
2016-10-10 21:42:22 +02:00
969220f324
FIRE-20112; Delay grid initialization until grid manager is ready.
2016-10-06 00:07:21 +02:00
bcb564a29e
Keep profileuri as synonym for web_profile_url for the gridlist in case we download them
2016-09-20 12:39:54 +02:00
8114953694
Rename grids.fallback.xml to grids.xml and clean up fsgridhandler on the way
2016-09-20 12:38:44 +02:00
c13d5c4072
Merge viewer-bear
2016-09-20 11:44:19 +02:00
9de9b58013
Add FSCoreHttpUtil to the project
2016-08-06 16:54:22 +02:00
3af46da957
FIRE-15972: Recognize InWorldz IZURLs properly
2016-06-28 19:32:10 +02:00
785662ba04
Change Gridhandler http code to support the new http-coroutine methods.
2015-11-01 17:57:00 +01:00
c218e524b2
Merge - Step 1; Still enough to do.
2015-10-26 20:20:13 +01:00
cfc3d0ce8f
A collection of fixes provided by Cinder Roxley
2015-02-28 17:35:52 +01:00
42755bac49
Don't write warnings about invalid grid to the log before the grid manager is initalized
2015-02-18 11:33:05 +01:00
b51b8035b4
Post-merge curl fixing
2014-10-22 03:21:14 +02:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
81cb25bc30
Use same grid labels for OS and havok versions
2013-11-17 00:21:43 -07:00
0eaeb2fe34
Fix command line loginuri on opensim version
2013-11-07 23:49:33 -07:00
4d0597a6e7
A little code cleanup in fsgridhandler
2013-11-07 20:13:10 -07:00
94327cee99
Remove some unused GridInfo entries
2013-06-25 22:44:34 -06:00
578ef533ad
FIRE-10620: Fix isInSecondLife() from incorrectly returning true.
2013-06-13 17:05:57 -06:00
bcc9e83a25
FIRE-10567: Support for upcoming OpenSim definable classified ads fee. Move check from GridInfo to login response.
2013-06-11 21:24:53 -06:00
a6bba1f286
FIRE-9814: Don't hardcode a minimum listing fee for classifieds on non-sl platforms.
2013-04-26 08:04:21 -06:00
3a02cfbe37
Fix FIRE-9613 & FIRE-9621
2013-04-02 14:33:03 -06:00
1f30846fb2
Updates to grid manager: Show advanced info but hide the ability to edit it by hand for now.
2013-03-30 13:13:41 -06:00
1a81af53e4
Replace silly grid bools with a grid platform enum
2013-02-09 12:01:39 -07:00
d145a7701f
FIRE-8063: Add Open Region Settings panel to the Region Info floater for aurora-sim; Add IsInAuroraSim() to fsgridhandler
2012-10-28 14:23:32 -06:00
Ansariel