summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepaneliteminfo.cpp
AgeCommit message (Collapse)Author
2024-10-15Fix merge issues:Ansariel
* Restore changes from 21947778baaca205615a71a97ac8f563c998fdd3 to llwindow/llwindowwin32.cpp * Restore changes from 3758618949684641fc94b5c9478d9002706213cc to newview/llinspecttexture.cpp * Fix apparent merge error in LLInventoryPanel::itemChanged * Restore changes from 1eeecfa1a8bf43a8980217ce34e3b5f4458483e0 in newview/llpaneloutfitsinventory.h * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d in newview/llpaneloutfitsinventory.h & newview/llpanelwearing.cpp * Restore changes from f660f1f0fda4d2363d351fa550b4f8818b46c2c3 in newview/llviewertexture.cpp * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d & 98f7d73d46fdc045759023eda6409e8c791f5cb2 in newview/lloutfitgallery.cpp and newview/lloutfitslist.cpp * Replace changes from 23729442aab7130f3368d433e8a5a9dd45ff6b98 with current implementation in develop branch * Fix more broken changes in LLViewerTexture::saveRawImage * Restore the changes in LLMath both from develop and maint-c * Fix all kind of other merge errors
2024-10-12Merge commit '15908fd34e' into marchcat/c-developAndrey Lihatskiy
# Conflicts: # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/newview/llappviewer.cpp # indra/newview/llconversationlog.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llimview.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llviewerjoystick.cpp # indra/newview/llviewerwindow.cpp # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
2024-10-11viewer#2172 AM/PM selector #2Andrey Kleshchev
2024-10-11viewer#2172 AM/PM selectorAndrey Kleshchev
2024-08-04Fix various issues with text segments not updating UI colorRye Mutt
2024-05-22Fix line endlingsAnsariel
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
# 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-07secondlife/viewer#1333 BOOL to bool conversion leftovers: ternariesAlexander Gavriliuk
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-04-10triage#166 Select 'No Description' when clicking on a text fieldAndrey Kleshchev
Default value should be selected for replacement
2024-02-21Convert remaining BOOL to boolAnsariel
2024-02-21Convert BOOL to bool in lluiAnsariel
2024-02-17misc: BOOL to boolLars Næsbye Christensen
2024-02-12miscellaneous: BOOL (int) to real boolLars Næsbye Christensen
2023-09-26SL-20341 Item Properties floater closes on changes for task inventory itemAndrey Kleshchev
2023-07-31SL-20096 Thumbnails shouldn't be editable for items in the libraryAndrey Kleshchev
2023-03-24SL-18003 Fix items not being marked as complete when fetched via aisAndrey Kleshchev
2023-03-23SL-19108 Disable "Image" button for task inventoriesAndrey Kleshchev
Thumbnails are not supported for task inventories yet
2023-02-17SL-19108 WIP Managing inventory thumbnail #3Andrey Kleshchev
2023-02-17SL-19108 WIP Managing inventory thumbnail #2Andrey Kleshchev
2023-02-08SL-19134 Multiline description fieldAndrey Kleshchev
2023-02-08SL-19134 Fix owner and creator names not being clickableAndrey Kleshchev
2023-02-08SL-19134 Hide item properties when moving to trashAndrey Kleshchev
2023-02-08SL-19134 Remove lock icon, add item type iconAndrey Kleshchev
2023-02-07SL-19134 Item Profile redesign #4Andrey Kleshchev
2023-02-07SL-19134 [WIP] Item Profile redesign #3Andrey Kleshchev
2023-02-04SL-19109 Turn LLSidepanelItemInfo into a normal panelAndrey Kleshchev
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-07-08SL-11472 Checkboxes continue to change their state after clicking is stopped ↵andreykproductengine
in the "Item profile" menu
2018-09-26MergeRider Linden
2018-09-20SL-9636: Hide the anyone, group share and for sale checks in the properties ↵Rider Linden
panel for settings. (didn't do others items it may apply to)
2018-09-07MAINT-9108 Disable "Copy" perm checkbox for settings type objectsmaxim_productengine
2018-08-02MAINT-8936 FIXED "Share" checkbox becomes gray in some inappropriate casesmaxim_productengine
2018-05-29MAINT-8586 Eliminate obsolete xui elementsandreykproductengine
2017-04-20MAINT-1463 Fixed inconsistent permissionsandreykproductengine
Permissions should be checked against owning group instead of active one
2017-03-30MAINT-7245 Use Experience Box in LSL Editor will not show as checked if ↵Mnikolenko Productengine
containing object is in another region
2017-02-02MAINT-288 Fixed Content of 'Object contents' tab blinks after editing it's ↵andreykproductengine
permissions
2016-04-04merge with 4.0.3-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-09-03Changes from code review with NatRider Linden
2015-09-02Move associated experience fetching into the ExperienceCache as a coro ↵Rider Linden
remove the responder.
2015-04-15Merge viewer-releasesimon
2014-11-11MAINT-4657 FIXED Objects can appear to have wrong 'for sale' type when ↵andreykproductengine
viewed in inventory
2014-05-07Merge with 3.7.7-releasedolphin
2014-03-12merge with releaseRichard Linden
2014-03-10Mergedolphin
2014-02-05MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:maksymsproductengine
- memory leaks fixing;
2013-09-23Added LLUrlEntryExperienceProfile to link to experience profilesdolphin
Added LLExperienceHandler to handle experience links Updated LLSidepanelItemInfo to use profile links
2013-08-19Added experience association info llsidepaneliteminfo for scripts.dolphin
Changed the cap which looks up a script association to take a object/item id pair instead of a asset id. Updated llpreviewscript to use the new cap (which also improves loading time since it can be done in parallel with the lsltext retrieval).
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-26 17:49:46 +0000