000f3be01a
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-18 23:53:40 +02:00
43941a3d87
SL-13669 tests should cover import/export category from llsd
2020-08-10 20:50:27 +03:00
357edecd9b
SL-13669 Change inventory cache to use a standard LLSD format
2020-08-04 15:30:20 +03:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
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
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
958292740c
Merged with RLVa tip
2014-02-26 22:44:49 +01:00
0c70c66dea
- fixed : GCC specific change
...
--HG--
branch : RLVa
2014-02-03 14:49:36 +01:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
6d46132ef5
SH-4216 WIP - finished item/cat update and reorg of aisv3 code
2013-06-10 16:29:10 -04:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
f7c9739fd9
SH-3635 WIP - COF slammer works in AISv3 regions. Extensive rework of onAISUpdateReceived.
2013-06-05 15:13:48 -04:00
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
6c56c77ec5
SH-4027 WIP - initial implementation of item update via AIS.
2013-05-24 08:53:21 -04:00
a04a706c1b
merge
2013-05-21 16:18:48 -04:00
d843a0d8be
SH-4137 WIP - added callback-based support for purge descendents, remove category
2013-04-25 17:09:05 -04:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
46ab23c94b
llinventory merge fixes
2013-03-11 18:02:16 -04:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
e0c9174609
merge
2013-03-11 15:05:47 -04:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
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
b04e00b2a3
Fix a few implicit double to float conversions, pedanticly add a few missing function prototypes
2013-07-28 14:41:32 -06:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
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
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
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
6425b3cd65
Merge RLVa SSB update
2013-02-24 18:24:48 -08:00
e1526c4048
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-20 14:26:21 +01:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
ceea332a9c
Change old style comments <ND> to <FS:ND> to avoid any future confusion/
2012-12-16 05:19:32 +01:00
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
9940ca5ae7
CHUI-101 WIP Make LLFolderView general purpose
...
llfolderview refactornig
2012-06-15 09:44:27 -07:00
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
5a14a67e06
converted a bunch of narrowing implicit conversions to explicit
2012-02-01 13:03:46 -08:00
11005a9d91
added fast timers to profile inventory LLSD deserialization
2011-08-10 10:52:56 -07:00
193fddd02a
Fix link error: unsigned char const TASK_INVENTORY_ASSET_KEY
2010-11-25 06:11:43 -05:00
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
8e44963c19
Inventory cache optimization, by Nicky Dasmijn
2011-10-15 13:28:01 -04:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
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
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
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
Ansariel