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

206 Commits (2bc4fb2bf0bef5adf709ef1fc90ba1bcdee7f8d0)

Author SHA1 Message Date
Ansariel 2bc4fb2bf0 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/llqueuedthread.cpp
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llcommon/llthreadsafequeue.h
#	indra/llinventory/llsettingssky.cpp
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llview.h
#	indra/newview/llaisapi.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterproperties.cpp
#	indra/newview/llfloaterproperties.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llpanelmarketplaceinbox.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpathfindingnavmesh.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepanelinventory.cpp
#	indra/newview/llsidepanelinventory.h
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
#	indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
#	indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
#	indra/newview/skins/default/xui/en/sidepanel_inventory.xml
#	indra/newview/skins/default/xui/en/sidepanel_item_info.xml
#	indra/newview/skins/default/xui/en/sidepanel_task_info.xml
#	indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
 2023-02-13 23:35:21 +01:00
Andrey Kleshchev a654989812 SL-19134 Replace icon in profiles with thumbnail 
Mostly to make sure it works, but avatar images can be fairly large, so this prevents them from being permanently stored
 2023-02-07 01:12:31 +02:00
Ansariel f156e0771f Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-02-03 00:55:58 +01:00
Zi Ree 9ba81d7299 Update radar notes column immediately when notes on an avatar's profile were edited. 2023-01-26 14:52:26 +01:00
Ansariel f499f0805f FIRE-32306: Fix the fix 2023-01-25 12:59:32 +01:00
Beq 6ffc7e64d1 [OpenSim] FixUp issues on profiles not updating 
Profiles were not updating (fixed following suggestion from Ubit - thanks)
Added additional code to save 1st life notes back to server.
 2023-01-23 17:11:15 +00:00
Ansariel e17f341ce2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-11-02 12:59:19 +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
Ansariel 492a208b75 More simplifications 2022-11-01 16:21:27 +01:00
Ansariel c047a29b1e Actually simplify this 2022-11-01 16:16:12 +01:00
Ansariel 7b3dcfba3c Fix nullpointer guard 2022-11-01 16:14:56 +01:00
Andrey Lihatskiy 91f9f2e9f7 DRTVWR-570 Mac build fix: unused variables cleanup 2022-10-27 23:08:09 +03:00
Ansariel 2b65ae8215 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-10-15 17:33:22 +02:00
Andrey Kleshchev 6f946b6b16 SL-18165 Tighten up some command permissions 2022-10-11 17:29:44 +03:00
Ansariel 7b2fa92f0e Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/llimagej2coj/llimagej2coj.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llpanelprofile.cpp
#	indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
#	indra/newview/viewer_manifest.py
 2022-10-04 14:17:44 +02:00
Ansariel 1dcacd598e FIRE-32191: Fix rezdate off by a day 2022-10-04 11:46:34 +02:00
Andrey Kleshchev f7cc8e4c8c SL-18047 Birthdate one day early 2022-10-03 23:47:19 +03:00
Beq 0cca2101e1 Merge remote-tracking branch 'origin/master' 2022-10-03 11:14:00 +01:00
Zi Ree ad060de41f Fix online status in profiles for friends that are hiding. 2022-09-29 03:10:05 +02:00
Beq a8fd107029 Restore udp profiles for opensim 
Restore UDP and remove superfluous buttons when no cap is available
Image  updates work as before (no direct from disk updates)
 2022-09-28 19:21:54 +01:00
Zi Ree 6cc91f43b1 Add Remove Friend button to profiles to swap with Add Friend 2022-09-25 00:25:31 +02:00
Zi Ree d2b69cf831 Allow proper texture handling for second and first life photos in profiles. 2022-09-23 15:47:59 +02:00
Zi Ree dae07a89df FIRE-32184: Online/Offline status not working for non-friends 2022-09-23 12:00:24 +02:00
PanteraPolnocy 2cf553461e A follow up; Fixing the copy/paste mistake 2022-09-20 01:25:55 +02:00
PanteraPolnocy f617ae2df7 Swap block/unblock buttons in the profile properly 2022-09-20 00:24:04 +02:00
Ansariel d80a3c0375 Restore LLPanelProfileSecondLife::updateRlvRestrictions() which was removed by merge accident 2022-09-13 20:28:17 +02:00
Ansariel 0af17f6584 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-09-13 20:23:04 +02:00
Ansariel db864c11cd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-13 20:14:22 +02:00
Andrey Kleshchev da8dcd70f9 SL-17984 Small cleanup in profiles 2022-09-06 01:23:41 +03:00
PanteraPolnocy 1b7669b3d7 Make "first life" picture clickable in profiles 
Not that pretty, but seems to work
 2022-09-03 19:07:52 +02:00
Ansariel 41d07e237a Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-08-31 16:05:55 +02:00
Ansariel 2f42e999e0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llhudtext.cpp
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
 2022-08-31 16:04:49 +02:00
Ansariel 4562d0bfc5 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-08-30 23:20:29 +02:00
Andrey Lihatskiy 5c18921e9a Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
 2022-08-31 00:16:09 +03:00
Ansariel c5c8a70cc4 Merge branch 'DRTVWR-483' of https://bitbucket.org/lindenlab/viewer 2022-08-10 19:09:12 +02:00
Andrey Kleshchev c4335939d9 SL-17925 Fix SLURL based creation of picks and classifieds 2022-08-10 19:03:12 +03:00
Andrey Kleshchev 946bdc1ee3 SL-14556 Profile floater does not update after a name change 2022-08-08 22:38:56 +03:00
Ansariel d57c1e1d54 Fix more profile floater related design accidents 2022-07-30 00:29:54 +02:00
Ansariel b90efbd3a8 Trash the pseudo "professional" UI/UX profile floater garbage and hammer it back into something useful 2022-07-29 23:49:49 +02:00
Ansariel 85d023a22e Merge branch 'DRTVWR-483' of https://bitbucket.org/lindenlab/viewer 2022-07-29 13:14:40 +02:00
Andrey Kleshchev 1f53aab286 SL-17773 Properly reset buttons 2022-07-14 19:07:25 +03:00
Andrey Kleshchev e0360ee13a SL-17773 Discard changes clears notes instead of setting previous version 2022-07-14 17:41:17 +03:00
Ansariel b1a5a5c64d Merge branch 'DRTVWR-483' of https://bitbucket.org/lindenlab/viewer 2022-06-29 18:23:43 +02:00
Andrey Kleshchev 2c940a1d80 SL-17633 Crash at LLFocusableElement 2022-06-20 22:51:08 +03:00
Andrey Kleshchev 750606c7a5 SL-17624 In profiles 'Remove Photo' remains inactive after uploading a photo 2022-06-20 20:16:55 +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
Ansariel 7513d529cb Merge branch 'DRTVWR-483' of https://bitbucket.org/lindenlab/viewer & some effortless re-adding of our things into this new iteration of a butchered legacy profiles abortion 2022-06-08 16:57:46 +02:00
Andrey Kleshchev 206892fe9e SL-17532 Apply padding after 'partner' 2022-06-07 21:00:56 +03:00
Andrey Kleshchev 111d1d7c94 SL-15312 Fixed group names not having padding 
Plus some focus and interactibility fixes
 2022-06-07 02:18:22 +03:00