9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
efbbbca9b0
Get unit tests (Integration and project) compiling and linking again.
2015-08-17 10:25:11 -07:00
67edc1edf5
merge 3.8.0-release and correct xml errors caused by reformatting
2015-07-14 16:01:15 -04:00
d631f2fd4d
Pull merge from lindenlab/viewer-tools-update (includes viewer-release)
2015-04-14 13:46:01 -07:00
5c6cf3e7fb
restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes
2015-04-10 11:02:37 -04:00
8952e81775
Merge lindenlab/viewer-tools-update
2015-04-09 16:51:02 -07:00
8b42c7898e
replace llifstream and llofstream with std::ifstream and std::ofstream respectively
2015-04-07 17:59:28 -04:00
f9113c286f
Merge
2014-10-09 16:10:00 -07:00
4b80a5ed05
Pull merge from lindenlab/viewer-release
2014-09-28 21:40:32 -07:00
81c342dfa9
Merge with 3.7.13-release
2014-08-06 09:22:43 -07:00
7aca96c241
MAINT-4292 FIXED Make Merchant Outbox Folder not movable (protected)
2014-07-31 20:11:17 +03:00
87a7eee21d
Sync merge with lindenlab/viewer-release
2014-07-22 15:54:53 -07:00
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
299921de32
Merge with 3.7.9-release
2014-06-17 13:09:15 -07:00
592024b580
Merge viewer-release and become version 3.7.9
2014-06-17 10:40:42 -07:00
086b2c0448
MAINT-4001 : Make Received Items not movable (protected), consolidate Received Items folders which may have been moved
2014-06-07 16:02:30 -07:00
c780f730fe
DD-92 : pull merge lindenlab/sunshine-external to get AISv3 work
2014-05-30 15:29:27 -07:00
68b62747ed
Pull merge from lindenlab/viewer-release
2014-05-30 14:19:53 -07:00
4c7b0cb528
ACME-1459: Experience tab added to the about land tab for editing parcel Experiences
2014-05-16 15:52:39 -07:00
487ca1bad3
v-r -> s-e merge WIP
2014-05-14 17:50:59 -04:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
48fece4473
Merge with 3.7.7-release
2014-05-07 11:14:26 -07:00
a5568f942b
Merge downstream version 3.7.8 code
2014-05-07 15:28:13 -07:00
155399cb71
parcel experience lists can be manipulated through the ParcelAccessListUpdate
...
message
2014-05-01 13:56:45 -07:00
b1cffda8f3
MAINT-2361 FIXED One and the same user shown in Allowed and in Banned Residents lists
2014-04-23 19:47:19 +03:00
ae564140c0
Merge
2014-04-22 12:19:28 -06:00
744cf6be8d
merge
2013-12-05 10:39:35 -05:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08: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
edf2b52cb2
MAINT-3082 : Remove unused viewer LLParcel code
2013-09-03 17:18:59 -07:00
9f7bfa1c37
moved unit types out of LLUnits namespace, since they are prefixed
2013-08-15 00:02:23 -07:00
26581404e4
BUILDFIX: added header for numeric_limits support on gcc
...
added convenience types for units F32Seconds, etc.
2013-08-14 11:51:49 -07:00
cc31b4ae79
SH-4399 FIX: Interesting: Texture console MB Bound 0/384 and texture queue bounces once per second
...
SH-4346 FIX: Interesting: some integer Statistics are displayed as floating point after crossing region boundary
made llerrs/infos/etc properly variadic wrt tags
LL_INFOS("A", "B", "C") works, for example
fixed unit tests
remove llsimplestat
2013-08-12 20:05:16 -07: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
3ed3b88892
Refactoring link creation calls in preparation for adding AIS v3 hook.
2013-08-09 13:36:36 -07:00
d27fc4ad33
MAINT-2257 : Create ability to limit region/estate and parcel access by
...
either Piof or Group membership (viewer changes). Using Mnikolenko's patch
2013-08-07 15:56:29 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -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
6b81b8629e
Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies
2013-05-05 17:45:35 -07: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
Oz Linden