livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,847 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

49 Commits (ee37ea4aa751de128ce51f59260716d8ee8ee6ed)

Author SHA1 Message Date
Callum Prentice 8631a7a077 Merge with tip of Master after a Viewer release 2021-07-19 14:35:44 -07:00
Andrey Kleshchev 21f70785d7 SL-15434 The 'Add to my Landmarks' star icon is not marked in the Top menu bar 2021-06-30 23:14:16 +03:00
Callum Prentice 99b99a1b4a Clean up a merge conflict 2021-04-29 13:45:15 -07:00
Andrey Kleshchev 3f31901640 Merge master (DRTVWR-515) into DRTVWR-516-maint 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/llcoros.cpp
#	indra/llmessage/llcoproceduremanager.cpp
#	indra/newview/llfloaterfixedenvironment.cpp
#	indra/newview/llfloaterimsessiontab.cpp
 2021-04-29 21:00:25 +03:00
Andrey Kleshchev be7f6b8575 SL-14956 Fix landmarks sometimes staying in mLoadedCallbackMap #2 
Improved fix
 2021-04-23 17:48:48 +03:00
Andrey Kleshchev 1b900651f1 SL-14956 Fix landmarks sometimes staying in mLoadedCallbackMap 2021-04-21 22:36:34 +03:00
Callum Prentice 168d177197 This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal 2021-03-09 14:39:51 -08:00
Andrey Lihatskiy ec824a16d5 Merge branch 'master' into DRTVWR-516-maint 2021-03-09 21:57:53 +02:00
Andrey Lihatskiy bb17e4b78e Merge branch 'master' into DRTVWR-515-maint 2021-03-09 21:56:14 +02:00
Brad Payne (Vir Linden) c83e740ef9 Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
 2021-03-08 13:56:16 +00:00
Andrey Lihatskiy 135d54a4ff Merge branch 'master' into DRTVWR-516-maint 2021-03-02 21:41:37 +02:00
Andrey Lihatskiy 35550e36db Merge branch 'master' into DRTVWR-515-maint 2021-03-02 21:41:26 +02:00
Andrey Kleshchev 6c2c8c62db SL-14793 Landmark fetching not cleaning request list on completion 2021-01-30 01:23:04 +02:00
Andrey Lihatskiy fb1238a1ce Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.cpp
#	indra/newview/llenvironment.cpp
 2020-11-13 18:26:56 +02:00
Callum Prentice 9b1d9150c2 Merge branch 'master' into DRTVWR-519 2020-11-11 13:22:35 -08:00
Andrey Kleshchev 5172f5d6d6 SL-14037 BugSplat Crash #646590: Enqueue failed in AIS 2020-10-01 22:36:52 +03:00
Andrey Lihatskiy 83822fd199 Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/newview/llvocache.cpp
 2020-09-28 22:39:06 +03:00
Callum Prentice 6be1f88a5e Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation 2020-09-24 14:45:39 -07:00
Andrey Kleshchev bf8cc6b2f7 SL-13986 Validate buffer size to avoid SIGBUS crash on sscanf 2020-09-23 22:44:17 +03:00
Callum Prentice 38faec3b11 Merge branch 'master' into DRTVWR-519 2020-09-22 13:07:39 -07:00
Callum Prentice 2e6f516411 Renamed the references to LLVFile and llvfile.* source code plus cmake scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more 2020-09-16 21:12:53 -07:00
Callum Prentice 3fc07dea01 First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change. 2020-09-16 18:53:24 -07:00
Andrey Kleshchev 5ff63f0d7b SL-13789 Crash 'Enqueue failed' due to viewer requesting over 4K landmarks 2020-08-17 21:52:33 +03: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 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
simon 38915f119c More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08: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
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden a52d203a4f SH-3405 WIP convert existing stats to lltrace system 
started conversion of llviewerassetstats
removed old, dead LLViewerStats code
made units tracing require units declaration
clean up of units handling
 2012-10-17 20:00:07 -07:00
Richard Linden 8d2f7a5265 SH-3405 WIP convert existing stats to lltrace system 
converted all remaining LLViewerStats to lltrace
 2012-10-15 19:43:35 -07:00
Sergei Litovchuk a1e401c626 EXT-7325 FIXED Disabled "Show on Map" context menu item in My Landmarks while landmark coordinates are being downloaded from landmarks list. 
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/866/.

--HG--
branch : product-engine
 2010-08-18 20:42:11 +03:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Tofu Linden 89f460cc9e fix build error from PE tree. 2010-01-20 10:40:44 -08:00
Dmitry Zaporozhan 6fac1bf369 Fix for normal bug EXT-3749 - Clicking landmark attachment on Group notices doesn't open side panel. 
--HG--
branch : product-engine
 2010-01-19 17:22:13 +02:00
Alexei Arabadji 4fc7b91a79 implemented EXT-2323 “Get rid from obsolete notification widgets”; 
--HG--
branch : product-engine
 2009-12-11 14:26:27 +02:00
James Cook cbc0783cd1 Created lightweight LLNotificationsUtil::add(), switched most alerts to use it 
Cuts number of includes of llnotifications.h from 300+ to 40.
 2009-11-25 01:15:50 -08:00
Steve Bennetts b078c44c9f EXT-1402 - Thousands of "WARNING: LLAssetStorage::getAssetData: Discarding duplicate request for asset" lines 
Added a list of requested landmark assets and limited the frequency of multiple requests for the same asset
 2009-10-26 15:25:55 -07:00
Steven Bennetts 4e22fa7578 Decided that the lldebugs should really be llwarns. 2009-09-23 23:32:29 +00:00
Steven Bennetts 8a9204596a Partial fix for EXT-1123 (this shouldn't merit a notification), but we should investigate why these requests are failing in the first place. 2009-09-23 21:08:50 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 
ignore-dead-branch
 2009-06-21 08:04:56 +00:00
Adam Moss b01c75cb42 svn merge -r117314:117337 
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
 2009-04-16 23:45:35 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Kent Quirk 667ca55bad svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release 
QAR-424
 2008-04-01 17:45:04 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Christian Goetze ce0a5fe145 EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release 
Actual action: branched maintenance-r68118, merged in release, then copied result into release
 2007-08-21 22:17:53 +00:00
Aaron Brashears 305c74d516 Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. 2007-02-02 17:28:58 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00