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
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
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
7a2070d795
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llscrollingpanelparam.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llvovolume.cpp
2024-04-24 18:59:46 +02:00
4a5b1c1bc5
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/JsonCpp.cmake
# indra/cmake/LLAddBuildTest.cmake
# indra/llcommon/lluuid.cpp
# indra/llcorehttp/CMakeLists.txt
# indra/llmessage/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llscripteditor.h
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvoavatar.cpp
# indra/test/CMakeLists.txt
# indra/test/test.cpp
2024-04-12 03:28:00 +02:00
17e1f3692c
Port from JsonCPP to Boost.Json for json parsing and serializing ( #1054 )
2024-04-06 02:03:58 +03:00
e341621a8e
Merge branch 'DRTVWR-594-maint-Y' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llmemory.cpp
# indra/llui/lltooltip.cpp
# indra/newview/llagent.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/notifications.xml
2023-12-27 13:00:20 +01:00
6abeb9983e
SL-20607 Version folder was not created when copying folders to marketplace
2023-11-17 16:38:58 +02:00
198cd4df09
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2023-03-30 14:09:50 +03:00
2180c2a443
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/llui/llfolderviewitem.h
# indra/newview/app_settings/settings.xml
# indra/newview/llaisapi.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorymodel.h
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llinventorymodelbackgroundfetch.h
# indra/newview/llsidepanelinventory.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-03-20 18:15:38 +01:00
ff6ff01c6a
SL-18629 Replacing UDP creation messages with callback based AIS
2023-03-10 19:32:47 +02:00
811da7dbb1
SL-18629 WIP Replacing UDP creation messages with callback based AIS #2
...
findCategory and move_item_to_marketplacelistings
2023-03-10 19:32:47 +02:00
f7838ca17c
Merge branch 'main' into DRTVWR-568
2022-12-12 11:13:10 -08:00
0710d95f4b
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake
2022-09-16 23:15:49 +02:00
2507bc6137
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-15 20:37:16 +02:00
b5861e58cb
Merge branch 'master' into DRTVWR-565-maint-P
2022-09-15 20:43:02 +03:00
c6fb722792
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
2022-08-31 17:57:06 +02:00
6717f4a609
SL-17834 MP window freezes when loading items from Inventory #2
2022-08-18 12:16:20 +03:00
5759be7cdf
SL-17834 MP window freezes when loading items from Inventory
...
1. Do not process all marketpalce changes at once, schedule them for later
2. Do not notifyObservers from notifyObservers
2022-08-17 20:32:12 +03:00
ac2ee57edb
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersearch.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/lllocationinputctrl.h
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/viewer_manifest.py
# indra/viewer_components/login/lllogin.cpp
2022-04-19 15:27:35 +02:00
1966d837e1
jsoncpp includepath should not include json/. jsoncpp includes a header "features.h"
...
which has the same name as a glibc header, allowing this header to be found without any prefix
will lead to head conflicts when there is a '#include "features.h"'
As a result all json headers need to be included via #include "json/reader.h"/"json/writer.h"
2022-04-18 02:50:43 +02:00
a629e845cf
SL-17171 Display Marketplace Error Messages only when trying to use Marketplace
2022-04-07 00:55:06 +03:00
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
2cc76d0bd0
SL-14388 Listing status issues
...
Log issue and try to recover
2021-05-15 12:43:19 +03:00
fd4b8a7bb1
Merge Firestorm LGPL
2019-11-12 18:45:02 +01:00
91fa31c065
Downstream merge from lindenlab/viewer-serval
2019-11-12 04:24:35 +02:00
46f739f348
Merge viewer-lynx
2019-10-29 18:32:17 +01:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
aab8ea7236
SL-12121 FIXED Unable to delete folders from 'Marketplace listings'
2019-10-17 19:15:02 +03:00
8369276a49
DRTVWR-493 LLViewerMedia to singleton
2019-06-21 20:55:39 +03:00
9d0d42c22b
Merge with FS tip.
2017-05-10 21:25:21 +02:00
f44edb205d
Merge viewer-lynx
2017-03-22 16:40:54 +01:00
459d5c6c32
MAINT-7117 Don't Show "Unknown error" in warning dialog
2017-03-20 11:09:11 +02:00
0c6e79a61d
Do not add include/json/, include/jsconcpp/ directly into the include path, rather clients have to include like "json/reader.h". This is necessary as those directories contain a file features.h, which also under Linux is a system header. This will lead GCC to pick up the wrong features.h (the one from json).
2017-01-16 16:06:11 +01:00
54ad513fcb
Merge viewer-bear
2016-06-24 11:35:43 +02:00
0a9f25bcfb
MAINT-6385: Ensure that VMM initialization only happens once after login and that it will only happen after the region caps have been received.
2016-06-22 13:35:13 -07:00
a0188a5358
Merge Firestorm LGPL
2016-05-09 12:41:24 +02:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
2797c5938a
Merge Firestorm LGPL
2016-04-05 10:47:23 +02:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
7620380018
Re-add fix for MAINT-5938 after coroutine merge
2016-04-02 04:38:52 +02:00
6adce024a5
MAINT-5938 FIXED when Marketplace is down viewer errors 499 at each login and teleport
2016-03-16 17:56:14 +02: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
c218e524b2
Merge - Step 1; Still enough to do.
2015-10-26 20:20:13 +01:00
1356be0fe9
MAINT-5691: Browser was using deprecated outbox display type AND not correctly returning error body to application.
...
LLCore:HTTP now will provide and LLSD translation of the message body when possible in the case of an error HTTP result
VMM alert boxes now use type="alertmodal" rather than "outbox"
2015-10-07 16:09:08 -07:00
75c6549fde
Set consistent terminology for yield/wait -> suspend for coroutines.
2015-09-18 11:39:22 -07:00
97236a42ca
MAINT-5507: Remove HTTPClient and related cruft.
2015-09-14 11:15:23 -07:00
f2da6ec2ac
Bit of cleanup around Translation and remove httpassetstorage
2015-09-11 17:34:53 -07:00
c8f41d200f
MAINT-4952: Slight change to marketplace logging allow direct logging of LLSD and remove unused logging function.
2015-09-11 09:46:16 -07:00
Ansariel