a891785f7a
typo fix
2013-01-10 07:45:43 +00:00
0c3df70dff
added newline to fix gcc builds
2013-01-09 23:15:32 -08:00
0f3411f2b4
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
2013-01-09 23:08:32 -08:00
a09719c0eb
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
2013-01-09 23:06:12 -08:00
1a888f786c
SH-3468 WIP add memory tracking base class
...
made LLTrace::MemTrackable support custom alignment
LLDrawable now uses MemTrackable new and delete operators
2013-01-09 23:05:07 -08:00
c539004c7e
fix a type casting error.
2013-01-09 23:37:22 -07:00
cda5666dc7
Automated merge with https://hg.lindenlab.com/richard/viewer-interesting
2013-01-09 22:44:44 -07:00
7cc37d949e
fix the merge errors from the changeset 3eadda9666cf
2013-01-09 22:43:10 -07:00
27bec2b2f2
yet more gcc fixes
2013-01-10 05:06:11 +00:00
90b5937c74
gcc fixes
2013-01-10 04:19:16 +00:00
34f231cc66
MAINT-1481: remove linux-updater; move logic to Linux update_install
...
Now that the viewer's own background updater logic is responsible for
downloading a new installer, the only functionality we still use in
linux-updater that couldn't be expressed more simply in bash is the UI. But
since most Linux distros capable of running SL at all have zenity, and all
will have xmessage, we can handle even the UI part. Add xmenity wrapper script
so update_install doesn't have to care which is present, and make the bash
script that used to launch linux-updater do the real work.
2013-01-09 20:39:06 -05:00
8b836f776a
gcc fixes
2013-01-10 00:14:46 +00:00
c4a1bd1c2f
viewer-development merge
2013-01-09 15:25:06 -08:00
b0c449d301
[MAINT-2185] Unable to upload terrain .raw files
...
- Fixed an issue where a slash was prepended to the beginning of the filename (which happened to be the full path)
2013-01-09 15:24:27 -08:00
d16757545c
Added tag 3.4.4-release for changeset e1bb1ae7d8b1
2013-01-09 18:19:24 -05:00
cdd45b9abb
merge changes for DRTVWR-276
2013-01-09 15:18:20 -05:00
42a33b6c62
tag merge of DRTVWR-276
2013-01-09 15:18:10 -05:00
386e918583
SH-3468 WIP add memory tracking base class
...
fix for linux build issues
2013-01-09 11:21:45 -08:00
4a84c7c8e5
More merge cleanup.
2013-01-09 13:20:41 -06:00
971e9bd203
More merge cleanup.
2013-01-09 12:41:57 -06:00
dda41e3458
Merge cleanup.
2013-01-09 12:08:31 -06:00
0ba9a00c31
SH-3468 WIP add memory tracking base class
...
cleaned up hacks used to get unit tests working
LLTrace::init now supports recursive initialization/cleanup
put NOMINMAX back in win32 header wrappers
2013-01-08 23:50:27 -08:00
2f91ffb45c
SH-3406 WIP convert fast timers to lltrace system
...
fixed Windows build problem (NOMINMAX redefinition)
2013-01-08 17:48:47 -08:00
8315e97453
Merge
2013-01-08 14:50:31 -07:00
bf55755262
merge changes for DRTVWR-277
2013-01-08 14:41:49 -05:00
954ebaed84
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
2013-01-08 13:40:59 -06:00
78f63524ab
tag merge of DRTVWR-277
2013-01-08 14:29:25 -05:00
b601bc3cbf
remove duplicated return (merge artifact)
2013-01-08 11:24:33 -05:00
a7dbaaa0af
merge changes for DRTVWR-250
2013-01-08 09:45:27 -05:00
77abdd04a4
tag merge of DRTVWR-250
2013-01-08 09:34:12 -05:00
3c341a11ab
SH-3468 WIP add memory tracking base class
...
more fixes for unit test crashes
added llcommon initialization/teardown for unit tests
that indirectly trigger lltrace
changed access of atomic refcount to use preincrement/decrement
operators to reflect desired semantics
always call apr_initialize in LLCommon::initClass, even
if already initialized...apr does internal reference counting
to keep things straight
2013-01-08 00:25:07 -08:00
b0d3975818
FIX INTL-110 remove utf8 BOM
2013-01-07 17:10:37 -08:00
1f4f028044
FIX INTL-110 fix corrupted chinese character in translation
2013-01-07 17:06:28 -08:00
8c654704d4
merge with head
2013-01-07 13:08:40 -08:00
6841351502
SH-3468 WIP add memory tracking base class
...
fix for unit test failures...cleanup apr without destroying
pools, allowing LLProxy to clean itself up as a singleton (and
avoiding spurious dependencies associated with manually destorying
singletons that rely on apr pools)
2013-01-06 21:37:31 -08:00
222941d83c
SH-3468 WIP add memory tracking base class
...
further compile error fixes
2013-01-04 20:40:21 -08:00
0d8f1077a6
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2013-01-04 16:46:25 -08:00
7dbb886037
SH-3468 WIP add memory tracking base class
...
further compile error fixes
2013-01-04 16:19:20 -08:00
cf8fa1a958
SH-3468 WIP add memory tracking base class
...
further compile error fixes
2013-01-04 15:57:28 -08:00
4ebd4b3616
SH-3468 WIP add memory tracking base class
...
further compile error fixes
2013-01-04 14:09:02 -08:00
cbff0e7ab8
SH-3468 WIP add memory tracking base class
...
attempted fix for gcc compile errors
can't use typeid() on a class that doesn't have a method
defined in a translation unit
fix is to force classes deriving from LLMemTrackable to
use their own static member named sMemStat
2013-01-04 13:48:35 -08:00
b2197101c4
SH-3468 WIP add memory tracking base class
...
fix for compile error on windows
ignore stdint.h even though VS2010 provides it
2013-01-04 13:04:09 -08:00
0d12d171cf
pull back 3.4.4-beta4 tag
2013-01-04 14:15:08 -05:00
fde976cf2b
Added tag 3.4.4-beta4 for changeset 05d9f1dd7a95
2013-01-04 14:09:03 -05:00
02d9734c45
merge back DRTVWR-275 from 3.4.4 beta
2013-01-04 10:12:04 -05:00
019836a396
More fixes for linux build of lltrace changes
2013-01-04 03:02:54 +00:00
def472b45c
tag merge of DRTVWR-275
2013-01-03 18:12:29 -05:00
6e82bb7789
fixing linux compile errors for llcommon after LLTrace work
2013-01-03 22:34:34 +00:00
2cba564b24
MAINT-2184 [crashhunters] new crash in LLUUID::toString
...
Fix dangling references.
2013-01-03 09:17:25 -08:00
cda2cdda51
SH-3406 WIP convert fast timers to lltrace system
...
made fast timer stack thread local
added LLThreadLocalSingleton
made LLThreadLocalPointer obey pointer rules for const
added LLThreadLocalSingletonPointer for fast thread local pointers
2013-01-03 00:30:54 -08:00
Andrew Meadows