Commit Graph

15 Commits (169c19ea36b4bdd203d207a14cb156ff4e490e14)

Author SHA1 Message Date
Ansariel 9b93864eb9 Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llcommon/tests/llleap_test.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfilepicker_mac.mm
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llurldispatcher.cpp
#	indra/newview/llvieweraudio.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
#	indra/newview/skins/default/xui/en/strings.xml
2023-04-21 14:22:42 +02:00
Andrey Kleshchev daca555592 SL-19609 Urls aren't dispatched according to the indicated grid 2023-04-19 20:06:37 +03:00
Ansariel 2b65ae8215 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-10-15 17:33:22 +02:00
Andrey Kleshchev 6f946b6b16 SL-18165 Tighten up some command permissions 2022-10-11 17:29:44 +03:00
Ansariel 24edb1e6ff Minor fixes for previous commit 2017-09-30 19:01:47 +02:00
Christopher Colosi 4ad7d4b750 Support for multiple currency solutions on a grid and across the hypergrid. 2017-09-20 16:00:25 -07:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05: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
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Merov Linden 0df07ea31a STORM-524 : Add some balance request messages after L$ purchase interaction 2010-12-09 11:45:24 -08:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Callum Prentice 9add3aa8cb Fixed Windows line endings that crept in 2010-05-21 15:27:27 -07:00
Callum Prentice d84990307b VI-65 - Addition of Quick/Eazy Buy Web based floater.
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency'
Reviewed by Sam/Richard
2010-05-21 15:22:32 -07:00