Commit Graph

28 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 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
maxim_productengine 0771d66ace SL-11567 FIXED The allowed and the blocked experiences are not listed in the "Allowed","Blocked" tabs immediately 2019-07-15 11:29:06 +03:00
Rider Linden e7eaa94dfa Merge VR 2016-01-15 13:36:38 -08:00
andreykproductengine 7d88f8814b SL-192 Edit Experience Profile shows up once an Exp is acquired 2015-11-05 19:40:26 +02:00
Rider Linden 75c6549fde Set consistent terminology for yield/wait -> suspend for coroutines. 2015-09-18 11:39:22 -07:00
Rider Linden 97236a42ca MAINT-5507: Remove HTTPClient and related cruft. 2015-09-14 11:15:23 -07:00
Rider Linden a455759e64 Convert exp floater to use coroutines
Convert script queue compilation exp request
2015-08-26 15:50:15 -07:00
Mnikolenko ProductEngine f3288e2685 ACME-1620 FIXED Newly acquired experience does not always show in Experience floater after being created 2014-11-21 12:40:30 +02:00
dolphin ab146c0a3f Check purchase info after receiving experience ownership list. 2014-10-21 10:39:02 -07:00
Cho 200788c344 Updated all experience responders for LLCurl::Responder interface changes for ACME-1535 and ACME-1536 2014-06-24 22:43:23 +01:00
Cho 7a15be83bf Updated LLExperienceListResponder to use new LLCurl::Responder interface to fix ACME-1533 2014-06-20 22:15:49 +01:00
dolphin bb5e0f7877 Enable the experience purchase button based on the sim providing purchase info. 2014-05-09 10:26:06 -07:00
dolphin d14673988d removed deprecated logging macros 2014-05-07 13:40:34 -07:00
Cho 2206f97d8e Added SEARCH tab to Experience floater for ACME-1420 2014-04-23 22:19:20 +01:00
dolphin dba034ee10 Experience log panel 2014-03-20 16:32:31 -07:00
dolphin 96457e1aff Disable the acquire xp button by default.
Mark the xp profile dirty when changing the group
2014-03-03 11:28:34 -08:00
dolphin 49f08d775d Add group editing for experiences 2014-02-28 16:21:42 -08: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 1385a53e33 Fixed typo in LLFloaterExperiences::postBuild 2013-10-24 09:53:27 -07: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 c08e820526 Fixed typo in experience list floater 2013-10-07 09:36:01 -07:00
dolphin e510fa3ee0 First pass at functional experience list floater 2013-10-03 12:59:44 -07: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