Rye Mutt
|
10e5e56946
|
Reduce findChild stalls in appearance floater
|
2024-07-25 23:24:39 -04:00 |
|
Ansariel
|
b42f9d836b
|
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
|
2024-06-01 15:49:26 +02:00 |
|
Ansariel
|
e2e37cced8
|
Fix line endlings
|
2024-05-22 22:40:26 +03:00 |
|
Ansariel
|
1b67dd855c
|
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# 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-22 19:04:52 +02:00 |
|
Andrey Lihatskiy
|
38c2a5bde9
|
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
|
2024-05-01 08:16:58 +03:00 |
|
Andrey Lihatskiy
|
1b68f71348
|
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
|
2024-04-29 07:56:09 +03:00 |
|
Ansariel
|
d0102af56d
|
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
# indra/llcommon/llapp.cpp
# indra/llcommon/llapp.h
# indra/llimage/llimageworker.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/llui/llkeywords.cpp
# indra/llui/lltabcontainer.cpp
# indra/llui/lltextbase.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfavoritesbar.h
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llhudnametag.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelvoicedevicesettings.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llselectmgr.cpp
# indra/newview/lltranslate.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
|
2024-04-11 21:59:38 +02:00 |
|
Ansariel
|
60d3dd98a4
|
Convert remaining BOOL to bool
|
2024-02-21 23:14:31 +02:00 |
|
Ansariel
|
a5261a5fa8
|
Convert BOOL to bool in llui
|
2024-02-21 03:00:25 +02:00 |
|
Ansariel
|
c285f59ce2
|
Replace BOOL with bool in llwindow and dependent classes
|
2024-02-18 15:51:54 +02:00 |
|
Andrey Kleshchev
|
a62f5bfac1
|
SL-20232 Allow deletion of worn items #1
|
2023-10-17 21:26:39 +03:00 |
|
Alexander Gavriliuk
|
b134e91d2a
|
SL-20419 Receiving new objects or items, etc causes inventory to switch from recent to my inventory tab
|
2023-10-11 21:22:30 +02:00 |
|
Alexander Gavriliuk
|
136a993ef2
|
SL-20419 Receiving new objects or items, etc causes inventory to switch from recent to my inventory tab
|
2023-10-11 21:19:40 +02:00 |
|
Alexander Gavriliuk
|
ef2a7fee11
|
SL-20432 Minor polishing in LLWearableItemsList::updateChangedItems
|
2023-10-11 15:21:27 +02:00 |
|
Alexander Gavriliuk
|
f02bc604e1
|
SL-20432 Minor polishing in LLWearableItemsList::updateChangedItems
|
2023-10-11 15:20:07 +02:00 |
|
Alexander Gavriliuk
|
c6a82a44f8
|
SL-20432 Buildfix
|
2023-10-11 14:40:20 +02:00 |
|
Alexander Gavriliuk
|
52c7aeb480
|
SL-20432 Buildfix
|
2023-10-11 14:39:12 +02:00 |
|
Andrey Kleshchev
|
07dc391ab7
|
SL-19720 Fix missing buttons for replacing body parts
|
2023-05-17 00:00:44 +03:00 |
|
Maxim Nikolenko
|
cfc2d2890e
|
SL-18243 Add wear and unwear buttons on line items in Outfits floater
|
2022-12-01 02:04:04 +02:00 |
|
Andrey Kleshchev
|
8f717b988a
|
build fix
|
2021-02-19 00:03:30 +02:00 |
|
Andrey Lihatskiy
|
185082f1bb
|
Merge branch 'master' into DRTVWR-521-maint
# Conflicts:
# indra/newview/llappviewer.cpp
|
2021-02-01 22:14:44 +02:00 |
|
Andrey Kleshchev
|
92af5af736
|
Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
|
2020-11-11 23:34:37 +02:00 |
|
Andrey Lihatskiy
|
0303dd8179
|
Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
|
2020-11-11 22:14:24 +02:00 |
|
Andrey Kleshchev
|
46ebe69f32
|
SL-14303 Fix LLWearableType to not spam in logs
|
2020-11-10 18:18:51 +02:00 |
|
Mnikolenko Productengine
|
cf2f0eddeb
|
SL-13278 FIXED Creating default clothing not accessible through "Edit My Outfit" for any type that does not already exist
|
2020-06-01 18:24:52 +03:00 |
|
Mnikolenko Productengine
|
353afb48f2
|
SL-13239 Add 'Touch' to the various attachment context menus
|
2020-05-28 18:38:01 +03:00 |
|
Mnikolenko Productengine
|
ae24afec8f
|
SL-13190 Allow Edit Attached Object Position From Inventory
|
2020-05-22 14:37:14 +03:00 |
|
Anchor Linden
|
56fc3222dc
|
[DRTVWR-476] - create new wearable type
|
2018-06-08 20:36:49 +05:30 |
|
Ansariel
|
2269a9f074
|
MAINT-8085 done right
|
2018-01-17 13:31:26 +01:00 |
|
Mnikolenko Productengine
|
ae41f0497e
|
MAINT-8085 'Edit Outfit' in "Appearance" continuously display "Loading...", when in this section no objects.
|
2017-12-13 17:08:38 +02:00 |
|
andreykproductengine
|
b7b98918eb
|
MAINT-4950 Appearance panel performance improvements.
|
2016-09-26 21:29:20 +03:00 |
|
Oz Linden
|
bc22e58743
|
merge changes for 4.0.1-release
|
2016-01-15 16:55:04 -05:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
andreykproductengine
|
9cddfc5a0e
|
MAINT-5443 FIXED Appearance menu does not display gestures in outfit
|
2015-08-28 16:24:12 +03:00 |
|
Brad Payne (Vir Linden)
|
9e3eb8991d
|
merge
|
2015-05-27 11:08:45 -04: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)
|
6aa63dce33
|
SL-103 WIP - viewer enforces wearable limits based on total articles of clothing rather than per-type limit. Limit is artificially low for testing, will bump before release.
|
2015-03-05 16:17:45 -05:00 |
|
Brad Payne (Vir Linden)
|
a07127ee7c
|
DRTVWR-397 - removed duplicate function
|
2015-02-27 10:45:50 -05:00 |
|
Brad Payne (Vir Linden)
|
b99d57fbde
|
MAINT-4196 WIP, including clearer inventory warnings for attachment errors
|
2014-10-23 06:20:10 -04:00 |
|
Richard Linden
|
e340009fc5
|
second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
|
2013-08-09 17:11:19 -07:00 |
|
Oz Linden
|
ddd5659f81
|
merge changes for DRTVWR-294
|
2013-04-19 10:11:29 -04:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
prep
|
8e3b190e91
|
merge
|
2013-03-11 15:17:13 -04:00 |
|
Don Kjer
|
cf7eb79fa7
|
Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
|
2012-09-08 04:39:11 +00:00 |
|
Brad Payne (Vir Linden)
|
b232919c0a
|
SH-3625 WIP - consolidating code paths for wearable/attachment removal
|
2012-08-21 17:03:42 -04:00 |
|
Oz Linden
|
634f152004
|
merge up to latest viewer-development
|
2011-02-08 11:57:38 -05:00 |
|
Vadim ProductEngine
|
ec0eafbaa0
|
STORM-348 FIXED "Edit" and "Lock" buttons appearing on body part items in outfit editor before they are hovered with mouse.
Added buttons reshaping code that exists in postBuild() methods of the other LLPanelWearableListItem descendants.
|
2011-01-19 21:41:53 +02:00 |
|
Loren Shih
|
63c504e4b0
|
Fix for bad merge error.
|
2010-08-26 12:37:43 -04:00 |
|
Loren Shih
|
a8f40db049
|
EXT-8751 FIXED "Create new" in Edit Outfit doesn't actually check if you can legally create a new item
Create New now makes sure you haven't exceeded max wearables.
Also took out debug camera hack.
|
2010-08-26 11:59:19 -04:00 |
|
Tofu Linden
|
e416840f85
|
Backed out changeset c3d41f18ce2b
back-out the back-out for this branch. yay.
|
2010-08-24 19:22:00 +01:00 |