Commit Graph

221 Commits (d4e9604700a1dbae3dbce58a3be0fda1465fd39c)

Author SHA1 Message Date
Andrey Kleshchev 375d01e17a SL-18735 Fix scroll not following item for long enough 2023-02-17 02:31:35 +02:00
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 6c54c9f8a9 Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/newview/llfilepicker.h
#	indra/newview/llfilepicker_mac.h
#	indra/newview/llfilepicker_mac.mm
2023-02-09 22:33:52 +02:00
Ansariel fb727de6e3 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/newview/llfilepicker.h
#	indra/newview/llfilepicker_mac.h
#	indra/newview/llfilepicker_mac.mm
#	indra/newview/llmeshrepository.cpp
2023-02-03 22:33:41 +01:00
Maxim Nikolenko 51142d1341 Merge branch 'main' into DRTVWR-567
# Conflicts:
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llpanelmaininventory.cpp
2023-02-03 16:53:33 +02:00
Kitty Barnett 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 6ae8248f5d Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llinventory/llsettingssky.cpp
#	indra/llui/llfolderviewitem.h
#	indra/newview/llappviewer.cpp
#	indra/newview/skins/default/xui/de/floater_about_land.xml
#	indra/newview/skins/default/xui/de/floater_avatar_textures.xml
#	indra/newview/skins/default/xui/de/floater_camera.xml
#	indra/newview/skins/default/xui/de/floater_camera_presets.xml
#	indra/newview/skins/default/xui/de/floater_linkreplace.xml
#	indra/newview/skins/default/xui/de/floater_people.xml
#	indra/newview/skins/default/xui/de/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/de/floater_preview_trash.xml
#	indra/newview/skins/default/xui/de/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/de/menu_gallery_outfit_tab.xml
#	indra/newview/skins/default/xui/de/notifications.xml
#	indra/newview/skins/default/xui/de/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/de/panel_group_roles.xml
#	indra/newview/skins/default/xui/de/panel_login.xml
#	indra/newview/skins/default/xui/de/panel_notification_list_item.xml
#	indra/newview/skins/default/xui/de/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/de/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/de/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/de/panel_progress.xml
#	indra/newview/skins/default/xui/de/panel_region_environment.xml
#	indra/newview/skins/default/xui/de/strings.xml
#	indra/newview/skins/default/xui/de/teleport_strings.xml
#	indra/newview/skins/default/xui/es/floater_animation_anim_preview.xml
#	indra/newview/skins/default/xui/es/floater_animation_bvh_preview.xml
#	indra/newview/skins/default/xui/es/floater_camera.xml
#	indra/newview/skins/default/xui/es/floater_god_tools.xml
#	indra/newview/skins/default/xui/es/floater_people.xml
#	indra/newview/skins/default/xui/es/floater_tools.xml
#	indra/newview/skins/default/xui/es/menu_viewer.xml
#	indra/newview/skins/default/xui/es/notifications.xml
#	indra/newview/skins/default/xui/es/panel_group_roles.xml
#	indra/newview/skins/default/xui/es/panel_landmark_info.xml
#	indra/newview/skins/default/xui/es/panel_login.xml
#	indra/newview/skins/default/xui/es/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
#	indra/newview/skins/default/xui/es/strings.xml
#	indra/newview/skins/default/xui/es/teleport_strings.xml
#	indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
#	indra/newview/skins/default/xui/fr/floater_camera.xml
#	indra/newview/skins/default/xui/fr/floater_camera_presets.xml
#	indra/newview/skins/default/xui/fr/floater_forget_user.xml
#	indra/newview/skins/default/xui/fr/floater_linkreplace.xml
#	indra/newview/skins/default/xui/fr/floater_people.xml
#	indra/newview/skins/default/xui/fr/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/fr/floater_preview_trash.xml
#	indra/newview/skins/default/xui/fr/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/fr/menu_gallery_outfit_tab.xml
#	indra/newview/skins/default/xui/fr/menu_viewer.xml
#	indra/newview/skins/default/xui/fr/notifications.xml
#	indra/newview/skins/default/xui/fr/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/fr/panel_group_roles.xml
#	indra/newview/skins/default/xui/fr/panel_login.xml
#	indra/newview/skins/default/xui/fr/panel_notification_list_item.xml
#	indra/newview/skins/default/xui/fr/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/fr/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
#	indra/newview/skins/default/xui/fr/panel_progress.xml
#	indra/newview/skins/default/xui/fr/panel_region_environment.xml
#	indra/newview/skins/default/xui/fr/strings.xml
#	indra/newview/skins/default/xui/fr/teleport_strings.xml
#	indra/newview/skins/default/xui/fr/widgets/density_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_avatar_textures.xml
#	indra/newview/skins/default/xui/it/floater_camera.xml
#	indra/newview/skins/default/xui/it/floater_camera_presets.xml
#	indra/newview/skins/default/xui/it/floater_god_tools.xml
#	indra/newview/skins/default/xui/it/floater_media_browser.xml
#	indra/newview/skins/default/xui/it/floater_people.xml
#	indra/newview/skins/default/xui/it/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/it/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/it/floater_stats.xml
#	indra/newview/skins/default/xui/it/menu_login.xml
#	indra/newview/skins/default/xui/it/menu_viewer.xml
#	indra/newview/skins/default/xui/it/notifications.xml
#	indra/newview/skins/default/xui/it/panel_group_roles.xml
#	indra/newview/skins/default/xui/it/panel_landmark_info.xml
#	indra/newview/skins/default/xui/it/panel_login.xml
#	indra/newview/skins/default/xui/it/panel_notifications_channel.xml
#	indra/newview/skins/default/xui/it/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/it/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/it/panel_place_profile.xml
#	indra/newview/skins/default/xui/it/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
#	indra/newview/skins/default/xui/it/panel_region_environment.xml
#	indra/newview/skins/default/xui/it/sidepanel_appearance.xml
#	indra/newview/skins/default/xui/it/strings.xml
#	indra/newview/skins/default/xui/it/teleport_strings.xml
#	indra/newview/skins/default/xui/ja/floater_camera.xml
#	indra/newview/skins/default/xui/ja/floater_camera_presets.xml
#	indra/newview/skins/default/xui/ja/floater_people.xml
#	indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/ja/notifications.xml
#	indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/ja/panel_group_roles.xml
#	indra/newview/skins/default/xui/ja/panel_login.xml
#	indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
#	indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/ja/panel_region_environment.xml
#	indra/newview/skins/default/xui/ja/strings.xml
#	indra/newview/skins/default/xui/ja/teleport_strings.xml
#	indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
#	indra/newview/skins/default/xui/pl/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/pl/panel_outfit_snapshot_inventory.xml
#	indra/newview/skins/default/xui/pl/panel_profile_firstlife.xml
#	indra/newview/skins/default/xui/pl/panel_profile_pick.xml
#	indra/newview/skins/default/xui/pl/panel_profile_picks.xml
#	indra/newview/skins/default/xui/pl/panel_profile_secondlife.xml
#	indra/newview/skins/default/xui/pl/panel_region_access.xml
#	indra/newview/skins/default/xui/pl/panel_script_experience.xml
#	indra/newview/skins/default/xui/pt/notifications.xml
#	indra/newview/skins/default/xui/pt/panel_group_roles.xml
#	indra/newview/skins/default/xui/pt/panel_landmark_info.xml
#	indra/newview/skins/default/xui/pt/panel_login.xml
#	indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/pt/strings.xml
2023-01-25 14:40:06 +01:00
Andrey Kleshchev a1931d8cc4 SL-18735 Using "Find original" in main inventory tab breaks inventory view
Fixes folders being invidible (missing arrange)
Fixes sroll to target not working reliably
2023-01-16 20:42:20 +02:00
Ansariel a9c29b4b81 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llui/lllineeditor.cpp
#	indra/llui/llmenugl.cpp
#	indra/llui/llmenugl.h
#	indra/llui/lltexteditor.cpp
#	indra/newview/llfloaterbump.cpp
#	indra/newview/llfloaterbump.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llnetmap.cpp
2022-10-20 10:51:25 +02:00
Rye Mutt b9552e596f Reduce folderview menu bloat via lazy creation on right click 2022-10-19 16:21:05 -04:00
Ansariel ef88337eef Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
Ptolemy b70614bd87 SL-16606: Add profiler category UI 2022-01-14 11:50:21 -08:00
Ansariel 63cc972499 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llappearance/lldriverparam.h
#	indra/llcommon/llmemory.h
#	indra/llcommon/llprofiler.h
#	indra/llrender/llvertexbuffer.cpp
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawable.cpp
#	indra/newview/lldrawable.h
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/lldrawpoolwater.cpp
#	indra/newview/llface.cpp
#	indra/newview/llinventoryfilter.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llvieweroctree.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvowlsky.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Ansariel 2253723705 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-21 14:13:23 +02:00
Andrey Lihatskiy 9873e7bba9 Merge branch 'master' into DRTVWR-527-maint 2021-07-19 22:22:32 +03:00
Ansariel 885215519d Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-12 11:56:45 +02:00
Andrey Kleshchev 5e134b4732 SL-13182 Fix root folder's state 2021-04-09 17:19:43 +03:00
Ansariel 14fb8f66f8 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2020-09-24 16:34:12 +02:00
Andrey Kleshchev 0d7f6d917a SL-13729 Performance of LLUI and LLRender2D #3 2020-09-18 17:27:12 +03:00
Andrey Kleshchev a5c8b1cbe2 SL-13729 Performance of LLUI and LLRender2D #2 2020-09-17 20:39:45 +03:00
Ansariel 0007ff2660 Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-07 12:29:58 +02:00
Andrey Kleshchev 59433e3132 SL-13119 Made control settings cached and fixed potential filtering issue 2020-04-30 16:32:16 +03:00
Ansariel 22dd92e012 Merge Firestorm 2020-02-21 11:53:36 +01:00
Ansariel f7b56e6f7c FIRE-19933: Wire up context menu key in inventory (and other folder views) 2020-02-16 01:46:08 +01:00
Ansariel 0b6b4c7097 Merge Firestorm LGPL 2019-11-15 19:05:26 +01:00
Dave Houlton dc1453af9c Merge in from viewer-release 6.3.5 2019-11-13 16:46:27 -07:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
Ansariel f8ad1551b3 Merge viewer-eep 2019-02-10 13:12:23 +01:00
andreykproductengine c8d8414b3b SL-10509 EEP Settings Picker gets closed by drag&drop 2019-02-08 19:06:20 +02:00
Ansariel e2c94f3454 Merge viewer-eep 2018-09-27 21:24:30 +02:00
maxim_productengine 92dc9ceb83 SL-9676 EEP Pick:SELECT SETTINGS limit folder operations options 2018-09-24 16:36:01 +03:00
Ansariel 59fa77d2d9 Fix next item gets selected if cutting in inventory 2018-01-11 13:02:46 +01:00
Ansariel 2347b25808 Merge viewer-neko 2017-06-09 11:49:10 +02:00
Kitty Barnett d7edeb2df8 STORM-2149: Add a warning notification when deleting a folder of filtered content 2017-06-02 16:44:00 +02:00
Ansariel 54ad513fcb Merge viewer-bear 2016-06-24 11:35:43 +02:00
andreykproductengine aff8dcea75 MAINT-85 Using mouse scroll while renaming item moves it out of My Inventory tab 2016-06-16 20:46:53 +03:00
Ansariel 04039bd5df Merge viewer-bear 2016-06-16 00:05:04 +02:00
Ansariel e3e8726553 Merge 2016-06-14 14:06:45 +02:00
andreykproductengine 3fe660d455 MAINT-85 changes should not be lost 2016-06-09 21:11:24 +03:00
Ansariel d10a87d6fb FIRE-14223: First-round fix for using mouse scroll while renaming an item moves line editor out of inventory floater: Finish renaming and accept changes when using the scroll wheel (identical behavior to clicking the up/down buttons and Windows Explorer) 2016-06-09 19:12:07 +02:00
andreykproductengine 256c25bd25 MAINT-85 Using mouse scroll while renaming item moves it out of My Inventory tab 2016-06-08 17:12:21 +03:00
Ansariel f68896905b Merge Firestorm LGPL 2016-05-23 16:09:09 +02:00
AndreyL ProductEngine b25a22a2c1 Merged in lindenlab/viewer-release 2016-05-19 23:02:37 +03:00
Ansariel 2889c5bf40 Merge viewer-bear 2016-05-09 17:24:00 +02:00
andreykproductengine b493edd2c3 MAINT-204 Fixed Top folder is expanded when my inventory filter is changed 2016-04-27 18:06:57 +03:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 6c9a672b7e Merge LL Viewer 3.8.2 2015-08-03 20:10:04 +02:00
AndreyL ProductEngine f5d22358d2 MAINT-5432 MAINT-5440 FIXED Crash
in LLUUID::operator==(LLUUID const &) and  LLFolderView::removeSelectedItems()
2015-07-28 09:01:20 +03:00
Ansariel ebf54d4b2d Merge with Viewer-VMM 2015-07-15 14:23:19 +02:00
Merov Linden 5cd0e7cf90 Pull merge from lindenlab/viewer-release 2015-05-29 17:11:37 -07:00
Ansariel 0e2a827873 Merge LL V3.7.30 2015-05-27 00:27:29 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Brad Payne (Vir Linden) 3ae8a821c3 merge 2015-04-24 08:55:20 -04:00
Merov Linden d631f2fd4d Pull merge from lindenlab/viewer-tools-update (includes viewer-release) 2015-04-14 13:46:01 -07:00
Ansariel 9be423524d Merge LL V3.7.27 2015-04-14 22:08:31 +02:00
Brad Payne (Vir Linden) 32940ee90b merge 2015-04-13 17:19:27 -04:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Merov Linden 9ba10bf1f2 Merge lindenlab/viewer-tools-update 2015-03-16 09:49:57 -07:00
Brad Payne (Vir Linden) dd7f0e2954 MAINT-4980 WIP - moved canAddWearables() to LLAppearanceMgr 2015-03-13 16:55:19 -04:00
Brad Payne (Vir Linden) fb072c9148 MAINT-4980 WIP - add context menu filtering based on the selection group 2015-03-13 16:38:23 -04:00
Brad Payne (Vir Linden) 64511ce28f SL-103 WIP - comment 2015-03-06 16:05:47 -05:00
Brad Payne (Vir Linden) d44e5b7d9c SL-103 WIP - comment re: possible future work 2015-03-06 15:57:11 -05:00
callum_linden 23711c9275 Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013 2014-12-10 08:44:08 -08:00
andreykproductengine c0ae1fe956 MAINT-4617 FIXED Viewer chews on "Inventory->Open and Select" until inventory received or recent items selected 2014-11-10 17:20:03 +02:00
Ansariel 48fc17d6e1 Merge LL V3.7.16 2015-01-14 17:36:30 +01:00
Ansariel a1fd8230bf Merge LL V3.7.12 2015-01-12 17:56:50 +01:00
andreykproductengine 0ab5b90e4b MAINT-4617 FIXED Viewer chews on "Inventory->Open and Select" until inventory received or recent items selected 2014-10-30 19:02:06 +02:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
callum_linden 7359e9300a Update to build on Xcode 6.0: collection of removal of unused const variables [-Wunused-const-variable] 2014-10-17 16:52:32 -07:00
Merov Linden 4b80a5ed05 Pull merge from lindenlab/viewer-release 2014-09-28 21:40:32 -07:00
Merov Linden 87a7eee21d Sync merge with lindenlab/viewer-release 2014-07-22 15:54:53 -07:00
simon d760a6889d Merge downstream code 2014-06-18 19:02:25 -07:00
simon 592024b580 Merge viewer-release and become version 3.7.9 2014-06-17 10:40:42 -07:00
Merov Linden 9c792f03b4 Pull merge from lindenlab/viewer-release 2014-06-17 09:50:48 -07:00
Merov Linden 252ad06b7b DD-84 : Final clean up for this fix 2014-06-04 09:58:11 -07:00
Merov Linden 86d75052f6 DD-84 : Fix all active listing modification actions. Add specific message when listing will unlist. Make update skip consistency check when called from internal level (not public API). 2014-06-03 19:46:33 -07:00
Stinson Linden 8392fde6f6 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365. 2014-06-02 22:32:16 +01:00
Brad Payne (Vir Linden) 67051b26ba merge 2014-05-19 18:10:45 -04:00
Stinson Linden babd89b770 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2014-05-19 22:19:55 +01:00
andreykproductengine ef26fdca3d MAINT-4072 FIXED Searching object content by typing letters no longer works for non-capitalised names. 2014-05-27 18:56:15 +03:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Stinson Linden b34cdbaa69 MAINT-4009: Patching a minor leak for when the status text box for the folder view has not been reparented. 2014-05-12 23:43:36 +01:00
simon dc4c184696 Merge downstream version 3.7.8 code 2014-05-07 13:19:05 -07:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Stinson Linden 001621dfc2 MAINT-4009: Patching a small memory leak for when menu items were being created before the viewer window initialization had created the menu holder. Also, added llasserts in other cases when referencing the menu holder to ensure the holder is non-null. 2014-05-05 23:24:34 +01:00
Xiaohong Bao ae564140c0 Merge 2014-04-22 12:19:28 -06:00
Brad Payne (Vir Linden) d0eb9658f2 merge 2014-04-22 11:19:58 -04:00
simon a5a0a0b136 Merge downstream code 2014-04-21 12:48:50 -07:00
simon 0b9a777bfd Merge downstream code updating version to 3.7.7 2014-04-21 12:36:35 -07:00
Tank_Master dc353c205a Merge 2014-06-10 20:27:31 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Tank_Master e3ea0378b6 Merge LL 3.7.6 2014-05-17 11:18:52 -07:00
Mnikolenko ProductEngine 6585027996 fix build problem 2014-03-05 12:25:52 +02:00
andreykproductengine 7a45e6fd77 MAINT-358 FIXED [PUBLIC]Verbs buttons are available for landmarks folder if it was selected via keyboard 2014-02-28 15:33:09 +02:00
Kitty Barnett 03319c629b [BUG-4617] Renaming an inventory folder can result in a different folder being moved inside another folder
-> after renaming folder 3 it will actually sort at the top, moving folder 2 to the bottom position
    -> when processing the left-click (onMouseDown) the items will be in their original order and the position saved is in local coordinates
    -> when processing the hover (onMouseHover) the items will have rearranged and even though the mouse hasn't moved, the item has moved
    => result is that since the item moved (relative to the stationary mouse) the viewer interprets it as a drag-and-drop operation
2014-02-04 23:19:36 +01:00