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
c364d878b3
SL-19167 Preview on outfit snapshot tool is too small
...
In thin windows preview can be tiny, make sure it displays properly
2023-02-09 12:51:20 +02:00
39a50b0fac
SL-19134 Fix thumbnail ctrl not drawing an 'X' for empty texture
2023-02-08 21:41:43 +02:00
e06c322971
SL-19134 Multiline description field
2023-02-08 17:43:49 +02:00
83cd767b24
SL-19134 Fix owner and creator names not being clickable
2023-02-08 16:37:45 +02:00
6e6ec9d10e
SL-19134 Hide item properties when moving to trash
2023-02-08 15:45:54 +02:00
693825158f
SL-19134 Remove lock icon, add item type icon
2023-02-08 14:35:56 +02:00
1cc41cb9c4
SL-19134 Remove llfloaterproperties
...
Looks like it wasn't used for a while and LLFloaterItemPropertie does the same thing now
2023-02-08 14:27:52 +02:00
97d58e6184
SL-19134 Item Profile redesign #4
2023-02-07 21:55:18 +02:00
c97de5ac48
SL-19134 [WIP] Item Profile redesign #3
2023-02-07 13:01:58 +02:00
627c7de801
SL-19134 Some texture related adjustments
2023-02-07 12:36:20 +02:00
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
3ecfeda2fd
SL-19134 Thumbnail ctrl
...
LLIconCtrl stores icons indefinitely which is undesired for fairly large and expected to be numerous thumbnails, LLTextureCtrl is tied to texture picker and has a number of limitations (already processes clicks, enforces label area). Intent behind LLThumbnailCtrl is to bridge the gap - to not store texture indefinitely and to allow further customisation.
2023-02-07 01:12:31 +02:00
afede9086a
Linux: Update openjpeg library (now built on focal). Previous version built on Bionic (which is imminent of being EOL) introduced some compatibility issues on systems with glibc 2.31 and beyond and resulted in linker failures.
2023-02-06 11:36:24 +11:00
9cee21ba8d
Updated Havok TPV lib to work with latest LL release
2023-02-05 15:20:34 +01:00
b6085fc90e
Openjpeg: Deprecation warning fix - dont set bpp in cmptparm when calling opj_image_create() as it is deprecated in favor of setting prec instead, remove redundant setting of bpp to squelch the warning
2023-02-05 19:18:18 +11:00
f41d6250ac
Revert "Linux: Stop GCC complaining about deprecated functions in target llimagej2coj"
...
This reverts commit e860d7ab59
2023-02-05 18:34:46 +11:00
e860d7ab59
Linux: Stop GCC complaining about deprecated functions in target llimagej2coj
2023-02-05 12:50:32 +11:00
0f64c31fcd
[FIRE-32599] Local Mesh - Add Support for broken collada (autodesk)
...
reuses the same LLDAELoader function.
2023-02-05 01:24:27 +00:00
2c11c3d935
Merge remote-tracking branch 'origin/master'
2023-02-04 20:43:02 +00:00
5eae4f873f
Linux: Update openjpeg library from 2.3.1 to 2.5.0
2023-02-05 07:10:20 +11:00
dd3dd51791
Linux: Update apr suite (sync with latest from LL)
2023-02-05 07:09:01 +11:00
6341b420d1
[FIRE-32624]++ Local Mesh floater is now better behaved
...
weird scrolly-not-scrolly fun on the log tab fixed
made the floater resizable
made the objects list scroll when it gets long enough.
fixed irritating border clippage on the setting tab.
2023-02-04 18:56:07 +00:00
7a99ce16d1
SL-19109 Turn LLSidepanelTaskInfo into a normal panel
2023-02-04 19:54:23 +02:00
13a65319e0
SL-19109 Turn LLSidepanelItemInfo into a normal panel
2023-02-04 19:54:23 +02:00
c7c3efc467
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-04 18:06:08 +01:00
e8554e70d3
FIRE-32685 French translation update, by Laurent Bechir
2023-02-04 18:05:57 +01:00
25b42dd190
SL-19109 Cut out object profiles from inventory
2023-02-04 18:35:20 +02:00
03640693bd
Make all shader and XUI files accessible from within Visual Studio
2023-02-04 16:11:37 +01:00
66a500b0da
[FIRE-32180] Local mesh fails to load Dae DAe DAE dAE and daE
2023-02-04 08:44:08 +00:00
7cd243238f
Updated Polish translation
2023-02-04 03:52:08 +01:00
78e908008f
Merge branch 'localmesh-v1.1'
2023-02-03 23:48:48 +00:00
72513ed510
[FIRE-32604][FIRE-32681] Fix slocal mesh scale weirdness and rigged mesh
...
Clean up handling of scaling
Don't apply mesh scale to containing object.
Also seems to fix weights not matching
2023-02-03 23:47:49 +00:00
c9ba8f1fce
SL-19109 Decouple object profiles from inventory
...
Potentially this won't stay as sidepanels, but such rework is planned for SL-19134, for now just making it possible to open multiple instances of item profiles
2023-02-03 23:56:35 +02:00
2f4902967a
Merge branch 'xcode-14.1' into andreyk/SL-19134
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
2023-02-03 22:59:50 +02:00
7cedcf36e2
Fix OSX build
2023-02-03 21:49:01 +01:00
c5fcf3066f
SL-7277 show Advanced permissions in Item profile that was opened from inventory
2023-02-03 22:35:09 +02:00
2d6edb088e
SL-19149 Highlight string match is misplaced when searching worn items
2023-02-03 22:22:11 +02:00
51142d1341
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# indra/newview/llappearancemgr.cpp
# indra/newview/llpanelmaininventory.cpp
2023-02-03 16:53:33 +02:00
e07e23756d
Fix Linux build
2023-02-03 12:57:07 +01:00
4eb139e605
Merge branch 'main' of https://github.com/secondlife/viewer
2023-02-03 00:56:11 +01:00
f156e0771f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-03 00:55:58 +01:00
8d21d29bd7
Increment viewer version to 6.6.10
...
following promotion of DRTVWR-570
2023-02-02 14:33:39 -05:00
db80fdb55b
SL-19104 update label and permissions display
2023-02-01 23:57:36 +02:00
ac3f1b54ec
SL-19104 Clean up inventory UI to prepare for thumbnails ( #66 )
2023-02-01 18:44:26 +02:00
999c8cd3b9
SL-19117 Textures should return asset id when thumbnail is not set
2023-02-01 16:38:47 +02:00
6ada89ce0b
SL-19117 Extend texture preview to show thumbnails when present
2023-02-01 16:38:47 +02:00
aa6c7902af
SL-18988 OSX buildfix
2023-02-01 16:38:47 +02:00
b2e3a07ab4
SL-18988 Updated contributions.txt
2023-02-01 16:38:47 +02:00
1140ae3489
Add a texture inspector and show it when hovering over an inventory textory (or folder containing - among others - exactly one texture) and when hovering over notecard embedded textures
2023-02-01 16:38:47 +02:00
Ansariel