Commit Graph

66 Commits (ee37ea4aa751de128ce51f59260716d8ee8ee6ed)

Author SHA1 Message Date
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Mnikolenko Productengine 43941a3d87 SL-13669 tests should cover import/export category from llsd 2020-08-10 20:50:27 +03:00
Mnikolenko Productengine 357edecd9b SL-13669 Change inventory cache to use a standard LLSD format 2020-08-04 15:30:20 +03:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Richard Linden 12f0f8cb72 changed over to manual naming of MemTrackable stats
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -07:00
Richard Linden cbe397ad13 changed fast timer over to using macro
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07: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
Brad Payne (Vir Linden) 6d46132ef5 SH-4216 WIP - finished item/cat update and reorg of aisv3 code 2013-06-10 16:29:10 -04:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Brad Payne (Vir Linden) f7c9739fd9 SH-3635 WIP - COF slammer works in AISv3 regions. Extensive rework of onAISUpdateReceived. 2013-06-05 15:13:48 -04:00
Brad Payne (Vir Linden) 34d2cd0376 SH-4207 WIP - use item updates with callback when updating link descriptions. Reworked updateAppearanceFromCOF() cof-validation stages. 2013-05-24 15:51:33 -04:00
Brad Payne (Vir Linden) 6c56c77ec5 SH-4027 WIP - initial implementation of item update via AIS. 2013-05-24 08:53:21 -04:00
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -04:00
Brad Payne (Vir Linden) d843a0d8be SH-4137 WIP - added callback-based support for purge descendents, remove category 2013-04-25 17:09:05 -04: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 46ab23c94b llinventory merge fixes 2013-03-11 18:02:16 -04:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
prep e0c9174609 merge 2013-03-11 15:05:47 -04:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Brad Payne (Vir Linden) f48011e4d0 SH-3339 WIP, SH-3645 WIP - added getActualDescription to obviate an obnoxious and widely-used workaround, re-create COF link after wearable edit to force COF version bump 2013-01-15 20:30:20 -05:00
Richard Linden 9d77e030d9 SH-3406 WIP convert fast timers to lltrace system
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
Don Kjer 7153d1db11 Partial rewrite of llifstream and llofstream (Windows implementation pending). Moved more functionality from llviewerwearable to llwearable 2012-09-20 04:29:17 +00:00
Seth ProductEngine 4e7c2c6942 CHUI-228 FIX Inventory object creation date initialized with 0 to avoid some folders reporting wrong creation date. 2012-08-02 22:49:42 +03:00
Richard Linden 3882e9c177 CHUI-101 WIP Make LLFolderview general purpose
more compilation fixes, just need to add getName() back to LLInventoryFilter et al
2012-06-20 00:19:05 -07:00
Richard Linden 9940ca5ae7 CHUI-101 WIP Make LLFolderView general purpose
llfolderview refactornig
2012-06-15 09:44:27 -07:00
Richard Linden 5a14a67e06 converted a bunch of narrowing implicit conversions to explicit 2012-02-01 13:03:46 -08:00
Richard Nelson 11005a9d91 added fast timers to profile inventory LLSD deserialization 2011-08-10 10:52:56 -07:00
Jonathan Yap 193fddd02a Fix link error: unsigned char const TASK_INVENTORY_ASSET_KEY 2010-11-25 06:11:43 -05:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Vladimir Pchelko d0dd18a908 EXT-6934 FIXED method LLInventoryObject::rename does not change Name, if string is empty after correction.
Problem description:
LLInventoryObject::rename corrects incoming string and remove odd spaces,
for example converts string "    " to empty string "",
as the result empty string can be set as InventoryObject name.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/505/

--HG--
branch : product-engine
2010-06-08 18:44:11 +03:00
Loren Shih 7bfa3e81e7 EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
Superficial header file cleanup.

Change made to simulator files as well.
2010-04-05 16:18:19 -04:00
Loren Shih 2eba9819df EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
Took out enums and flags from LLInventory into LLInventoryDefines
Did a bunch of header file reformatting for LLInventory.h

Change made to simulator files as well.
2010-04-05 15:02:36 -04:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Bryan O'Sullivan 30ff6cabd6 Merge with trunk 2009-08-31 13:47:47 -07:00
Loren Shih 7bbc5cdea6 svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-34223 : AVP Current Outfit Folder
For DEV-37485 : AVP Appearance Side Panel
For DEV-35335 : AVP Automatic Folder Classification

This merges the Appearance Side Panel / Ensemble Typing / Current Outfit Folder work for the AVP team.
2009-08-12 19:03:20 +00:00
Christian Goetze 87776b1944 svn merge -r128774:128808 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1737
effective merge: svn merge -r127126:128746 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27
2009-07-29 22:16:52 +00:00
Loren Shih f5ba6df4c2 svn merge -r 127369:127511 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/landmark-permissions__merge__viewer2.0.0.3-r127280 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
includes post-merge fix for DEV-36563 : Remove mAcceptsCallingCardNames

For DEV-36496 : Viewer merge for Landmark & Callingcard Permissions [VIEWER]
For DEV-36563 : Remove mAcceptsCallingCardNames

Test plans - EXTERNAL
* [ Test against a 1.30 server ]
* Test various permissions operations - both on items in inventory, and rezzed items and items that are embedded in objects.
* Test creating landmarks.

Test plans - INTERNAL
* Test against any inventory permissions smoke tests.
* See test plans in QAR-1644 for full Landmark&Callingcard Permissions test plan.
2009-07-24 16:20:15 +00:00
Loren Shih 17b9cda432 For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"
svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk

This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions.
2009-07-24 00:46:26 +00:00
Loren Shih 363de6c3bc svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-links__merge__viewer-2.0.0.3-r127634 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-36425 : Viewer merge for Folder Links and Types [VIEWER]

Test plans - EXTERNAL
* [ Test against a 1.30 server ]
* Test various inventory operations -- move, copy, paste-as-link, etc. on both folders and inventory items.
* Test ability to change user-created folder types.  Test inventory operations on these folder types.

Test plans - INTERNAL
* Test against any inventory smoke tests.
* See test plan in QAR-1643 for full FolderLinks&Types test plan.
2009-07-23 23:41:12 +00:00
Loren Shih a00af78b95 merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-06-24 21:36:42 +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
Andrew Meadows 3d4e04b556 QAR-1284 ip-takedown tools simulator work is ready for merge
svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5
no conflicts
2009-04-01 17:11:37 +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
Kartic Krishnamurthy 80f6196327 QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventory Descendents - to Release
Related Jiras:
1. DEV-17797 New Top Causes of Inventory Loss is Attachments with null folder_id
2. DEV-17937 null asset id not handled correctly in ais inventory fetch
3. OPSRT-1097 Update python-indra package on the system images
4. DEV-20505 QAR-751: Banning Cap "FetchLibDescendents" results in error in viewer log.
5. DEV-20328 QAR-751 Excessive log spam when using ais viewer against ais sim
6. DEV-20335 QAR-751 AIS bans are missing from message.xml

svn merge -r95983:96590 svn+ssh://svn/svn/linden/branches/ais-for-merge-qar-751 .

Miscellaneous commit:
1. Fixed silly bug in llsd-rest that broke connects to https on a non-standard port
2008-09-16 18:12:32 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00