livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,051 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

137 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Ansariel 67081f9728 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloater360capture.cpp
 2022-12-12 22:09:54 +01:00
Ansariel 9ee1a75474 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llcharacter/llkeyframemotion.cpp
#	indra/llcommon/lluuid.cpp
#	indra/llcommon/lluuid.h
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/llscrolllistctrl.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersettingsdebug.h
#	indra/newview/skins/default/xui/en/floater_settings_debug.xml
#	indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
 2022-11-01 17:17:56 +01:00
Andrey Lihatskiy 91f9f2e9f7 DRTVWR-570 Mac build fix: unused variables cleanup 2022-10-27 23:08:09 +03:00
Ansariel 3d7c5c52d9 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-31 17:26:51 +02:00
Ansariel 33621382b4 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloateroutfitsnapshot.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterpreference.h
#	indra/newview/llfloatersnapshot.cpp
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/skins/default/xui/en/floater_outfit_snapshot.xml
 2022-07-21 19:54:15 +02:00
Mnikolenko Productengine fcb3b6917c SL-17670 Simplify outfit snapshot floater 2022-07-19 18:56:59 +03:00
Ansariel 41a2cc3e8a Merge branch 'DRTVWR-483' of https://bitbucket.org/lindenlab/viewer 2022-06-10 09:39:48 +02:00
Andrey Kleshchev ababcc700c SL-17532 Ability to pick inventory image as a profile image 2022-06-09 00:22:02 +03:00
Andrey Lihatskiy edb6293528 Merge branch 'master' into DRTVWR-530-maint 2021-12-15 21:50:40 +02:00
Ansariel 969762f162 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 16:29:50 +01:00
Andrey Lihatskiy 0bffd3d365 Merge branch 'master' into DRTVWR-519 
# Conflicts:
#	README.md
 2021-11-16 01:21:05 +02:00
Andrey Lihatskiy 30c381406c Merge branch 'master' into DRTVWR-530-maint 
# Conflicts:
#	doc/contributions.txt
 2021-11-16 01:09:11 +02:00
Ansariel 1536fdd1c3 Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-24 10:47:18 +02:00
Ansariel 9718a38e9a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-21 03:07:48 +02:00
Andrey Lihatskiy 6c8e6f033b Merge branch 'master' into DRTVWR-521-maint 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llerror.cpp
#	indra/llui/llnotifications.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewermacosx.cpp
 2021-07-20 02:48:05 +03:00
Callum Prentice 8631a7a077 Merge with tip of Master after a Viewer release 2021-07-19 14:35:44 -07:00
Andrey Lihatskiy 3a476a8296 Merge branch 'master' into DRTVWR-530-maint 2021-07-19 22:22:42 +03:00
Ansariel 826ee26272 Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2021-06-08 19:55:43 +02:00
Ansariel 0382c73f9d Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2021-06-08 14:31:00 +02:00
Andrey Kleshchev 823f97ac59 SL-15272 Bugsplat crashes at condition wait() 
Made sure all waits will be triggered, won't loop back and that in case of http queue it had some time to trigger
 2021-06-03 21:31:30 +03:00
Andrey Kleshchev 777f3f48d0 SL-15291 Outfit Gallery shows 3 items per row when only 2 can fit 2021-06-01 23:11:27 +03:00
Andrey Kleshchev 96cbe52803 SL-15272 Bugsplat crashes at condition wait() 
Made sure all waits will be triggered, won't loop back and that in case of http queue it had some time to trigger
 2021-05-21 20:52:08 +03:00
Callum Prentice 168d177197 This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal 2021-03-09 14:39:51 -08:00
Andrey Lihatskiy 8d5f5b4ced Merge branch 'master' into DRTVWR-521-maint 2021-03-09 22:00:01 +02:00
Andrey Lihatskiy ec824a16d5 Merge branch 'master' into DRTVWR-516-maint 2021-03-09 21:57:53 +02:00
Brad Payne (Vir Linden) c83e740ef9 Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
 2021-03-08 13:56:16 +00:00
Ansariel e3cb162f51 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-03 22:05:58 +01:00
Ansariel c36098c881 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-03-03 21:20:43 +01:00
Ansariel 6b6b116fd4 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2021-03-03 00:20:02 +01:00
Andrey Lihatskiy 9ba43b5ce9 Merge branch 'master' into DRTVWR-521-maint 2021-03-02 21:42:32 +02:00
Andrey Lihatskiy 135d54a4ff Merge branch 'master' into DRTVWR-516-maint 2021-03-02 21:41:37 +02:00
Ansariel f7bd33161b Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-12 11:05:22 +01:00
Andrey Kleshchev 46ebe69f32 SL-14303 Fix LLWearableType to not spam in logs 2020-11-10 18:18:51 +02:00
Ansariel 0e75268007 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2020-09-29 11:41:06 +02:00
Andrey Lihatskiy 83822fd199 Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/newview/llvocache.cpp
 2020-09-28 22:39:06 +03:00
Callum Prentice 6be1f88a5e Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation 2020-09-24 14:45:39 -07:00
Andrey Kleshchev 94ebf52edd SL-12435 Crash on mRowPanels.back() 2020-09-24 20:56:23 +03:00
Ansariel 14fb8f66f8 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2020-09-24 16:34:12 +02:00
Callum Prentice 38faec3b11 Merge branch 'master' into DRTVWR-519 2020-09-22 13:07:39 -07:00
Callum Prentice 2e6f516411 Renamed the references to LLVFile and llvfile.* source code plus cmake scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more 2020-09-16 21:12:53 -07:00
Mnikolenko Productengine 5cceddbc35 SL-13930 Appearance sort order should be similar to Inventory sort order 2020-09-14 12:13:33 +03:00
Andrey Lihatskiy ec9b989863 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
 2020-05-05 00:37:16 +03:00
Andrey Lihatskiy b6441bf09b Merge branch 'DRTVWR-500' into DRTVWR-501-maint 2020-04-29 19:34:39 +03:00
Ansariel 27e54f56ad Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
 2020-04-23 19:53:01 +02:00
Andrey Lihatskiy a520c01c73 Merge branch 'master' into DRTVWR-501-maint 2020-03-28 01:00:34 +02:00
Ansariel 96b9b2f47d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-03-19 09:48:32 +01:00
Ansariel 2324368336 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-03-19 08:10:15 +01:00
Dave Houlton 331f290f61 Merge master (v 6.3.9) into DRTVWR-440 2020-03-18 15:39:38 -06:00
Ansariel 90cbec4a54 Merge DRTVWR-481 2020-02-08 18:43:22 +01:00
Brad Payne (Vir Linden) 28633bd159 SL-12569 - Fixed more places where texture upload cost was hardcoded in UI 2020-01-16 14:45:26 +00:00