e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
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
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
85f2447b3d
Merge branch 'main' into marchcat/a-merge
...
# Conflicts:
# autobuild.xml
# 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/llinventoryfunctions.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llvovolume.cpp
2024-04-24 19:28:15 +03:00
17e1f3692c
Port from JsonCPP to Boost.Json for json parsing and serializing ( #1054 )
2024-04-06 02:03:58 +03: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
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
b5861e58cb
Merge branch 'master' into DRTVWR-565-maint-P
2022-09-15 20:43:02 +03: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
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
2cc76d0bd0
SL-14388 Listing status issues
...
Log issue and try to recover
2021-05-15 12:43:19 +03:00
91fa31c065
Downstream merge from lindenlab/viewer-serval
2019-11-12 04:24:35 +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
459d5c6c32
MAINT-7117 Don't Show "Unknown error" in warning dialog
2017-03-20 11:09:11 +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
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04: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
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05: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
6a204b1bdd
MAINT-5575: Finished converting experience cache to singleton
...
MAINT-4952: Coverted VMM to coroutines
2015-09-10 16:48:01 -07:00
9df2e7e4cb
Merge
2015-08-11 12:18:47 -07:00
efa9a0f99c
Backed out changeset bab1000e1b2d: restore 'selfless' changes
2015-07-10 19:30:10 -04:00
247eb0c9c3
Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5
2015-07-07 19:41:27 +01:00
b262ded7e0
MAINT-5351: Remove 'self' parameter from coroutine functions.
...
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest
builds clean, but the resulting viewer is as yet untested.
2015-07-01 18:33:29 -04:00
91c6f7a352
DD-393 : Rework association so that is_listed property is not overwritten before we get data from SLM
2015-06-10 22:08:36 -07:00
ab73b1af8f
DD-416 : Added DAMA when version folder is empty and unlisted, accelerated some functions avoiding depth computation when we could, fixed cut case
2015-06-10 14:53:12 -07:00
4f9bf22d5f
DD-336, DD-359 : WIP : Introduced a reverse lookup table for version folder to listing folder to improve performance
2015-06-08 14:58:40 -07:00
daf4d167b6
Added a seek method to LLCore::Http for data rewind.
...
A couple of minor changes to merchant out box in hopes that the would fix the issues.
2015-06-05 15:19:24 -07:00
2abfc14946
Marketplace vendor outbox. Incomplete conversion. Still issues with redirection.
2015-06-01 16:56:42 -07:00
e1aaebd59d
DD-396 : Add decription check on the common 422 error on marketplace listing
2015-05-02 14:46:30 -07:00
5411f349e5
DD-379 : a 404 on a Get /listing means that said listing is not in SLM, then delete it from the local store
2015-04-13 17:18:01 -07:00
50805277b3
DD-382 : Use default values on association when version folder is not unique
2015-04-13 15:58:56 -07:00
637e096d57
DD-388 : More resilient way of reacting to not evaluated stock count throughout marketplace handling
2015-04-13 15:29:56 -07:00
a9c3681cb5
DD-381 : Avoid unecessary SLM updates, suppress some update_marketplace_category() that are picked by dirty bit setup
2015-04-10 17:37:11 -07:00
137185c2a9
DD-382 : Activation state should be unchanged when reassigning listing id
2015-04-09 14:28:58 -07:00
56b1f3d881
DD-382 : Refactored the auto activate code in create and associate listing. Update count on hand in reassociate correctly.
2015-04-08 23:14:43 -07:00
79b891a688
DD-382 : Set count_on_hand correctly when creating or assigning a listing
2015-04-07 15:22:32 -07:00
8e11798380
DD-338 : Auto unlist when stock gets to 0 during stock folder manipulation
2015-04-02 14:01:03 -07:00
Ansariel