Commit Graph

17 Commits (master)

Author SHA1 Message Date
Ansariel 0ecfbc3de9 Merge remote-tracking branch 'LGPL/master'
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llappearance/llwearable.cpp
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp
#	indra/newview/llimpanel.cpp
#	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/llpaneleditwearable.cpp
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	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/llviewermenu.cpp
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
2024-05-16 14:10:55 +02: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 a5261a5fa8 Convert BOOL to bool in llui 2024-02-21 03:00:25 +02:00
maxim_productengine ba3f88c867 SL-187 FIXED The experience list is unsorted the first time you open Experiences 2020-03-12 17:47:51 +02:00
andreykproductengine 7d88f8814b SL-192 Edit Experience Profile shows up once an Exp is acquired 2015-11-05 19:40:26 +02:00
Cho f804bcadb1 Added 'Loading experiences...' message on experience lists before populating lists for ACME-1543 2014-07-02 01:05:52 +01:00
Cho f80a41cf36 Sort experiences in list alphabetically by name for ACME-1537 2014-06-27 01:02:44 +01:00
dolphin 9fe5728b43 Show ignored items when updating an experience profile 2014-03-12 09:50:08 -07:00
dolphin c1f730ed46 Moved the experience acquire code to the experiences panel 2014-02-26 17:32:21 -08:00
dolphin 1319a6258a Fixing coding policy errors 2013-11-11 13:58:46 -08:00
dolphin 309ffd57fa Post events on experience permission changes to refresh uis 2013-10-22 10:51:53 -07:00
dolphin 1aed2f848c Added LLTabContainer::getTotalTabWidth
Cleaned up experience profile floater
2013-10-15 16:42:55 -07:00
dolphin e510fa3ee0 First pass at functional experience list floater 2013-10-03 12:59:44 -07:00
dolphin 61874872a7 Updated experience cache to latest web service api
Added new CAP request for experiences the avatar can sign
2013-02-13 14:20:35 -08:00
dolphin 179e944f45 Updated client to use new caps
brought over server changes to llExperienceCache
2012-12-18 16:06:00 -08:00
dolphin@dolphin-THINK.lindenlab.com 2cde962d5d Test populating the experience keys UI with avatar name data. 2012-11-19 08:06:42 -08:00
dolphin@dolphin-THINK.home d51bd95a1f Added a simple ui for displaying experiences keys with hardcoded contents. 2012-11-13 08:24:18 -08:00