6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
3d1ac7c0ec
Merge LL 3.7.3 (Viewer-Bear fixes)
2014-03-17 14:14:15 -07:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
cfadbe631f
Revert earlier back-out for MAINT-535 ... it's back in
2014-01-10 13:15:19 -08:00
f291995dac
Revert changes made for MAINT-535 to test in a release cohort.
2014-01-07 15:18:29 -08: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
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
17df8988fe
renamed TraceType to StatType
...
added more MemTrackable types
optimized memory usage of LLTrace some more
2013-10-07 13:38:03 -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
053d97db1b
better memory usage for LLTrace (tighter packing of recording arrays)
...
removed complicated and unnecessary fast timer gapless handoff logic (it should be gapless anyway)
improved MemTrackable API, better separation of shadow and footprint
added memory usage stats to floater_stats.xml
2013-09-25 19:12:35 -07:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -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
27d637d0f1
Merge downstream code from CHUIStorm release
2013-08-26 14:43:23 -07:00
e7bc0e6e63
BUG-3605 / CHUIBUG-197 Don't create excessive amounts of string objects in LLNormalTextSegment::getNumChars.
2013-08-14 01:00:41 +02:00
3e934d5089
MAINT-3151 (Issue with urls being autoclicked when holding left click into an unfocused textbox then dragging pointer over a url and releasing.)
2013-09-23 09:14:53 +03:00
28339afa15
MAINT-535 'trust model' is added for secondlife:// URLs in wiki style links. Chat history is marked as untrusted source now.
2013-10-22 12:47:16 +03:00
1ba7d93a6a
[BUG-3527] Replacing a misspelling surrounded by line break segments results in only line breaks being inserted
2013-08-12 19:34:42 +02:00
8e3e639388
Add request teleport option to V2 chat header context menu & avatar SLURL context menu
2014-01-29 20:23:41 +01:00
68235b2b03
Include Add to Contact Set in menu_url_agent.xml
2013-12-26 17:33:03 -07:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08: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
8208a40412
BUILDFIX: reverted changes that attempted to automate mem track
...
stat definition as they don't work on gcc/clang
2013-07-01 18:50:51 -07:00
04bdc8ba83
SH-4294 FIX Interesting: Statistics Texture cache hit rate is always 0%
...
also, removed LLTrace::init and cleanup
removed derived class implementation of memory stat for LLMemTrackable
is automatic now
2013-07-01 17:04:01 -07:00
2b8beeeff1
CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")
...
Fixed "Add friend" option always being greyed out, add ability to block object via context menu in compact chat mode.
2013-06-20 12:45:22 +03:00
882ab04ef3
CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")
...
Added callback for friendship checking
2013-06-13 20:21:24 +03:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
0ada8944ee
CHUI-964 ADD FIX Oversized "To" input field hides actual IM text
2013-06-05 19:40:06 +03:00
3bbab5bb46
CHUI-957 FIXED Missing line was added.
2013-06-04 14:45:19 +03:00
0b4b92cbbf
Pull merge from lindenlab/viewer-release
2013-05-30 14:07:59 -07:00
507ce0d84f
Merge downstream code
2013-05-29 14:42:19 -07:00
2113bb8159
Pull merge from viewer-release
2013-05-22 11:23:51 -07:00
892f3cdd2c
CHUI-967: fix display of % escapes in chat
2013-05-22 06:26:54 -04:00
41b4374760
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect
standard naming conventions for handlers vs. reactors
2013-05-10 17:57:12 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
043f2e0bfd
Pull from viewer-release
2013-05-02 14:09:40 -07:00
5cf1c9bfe1
CHUI-845 : Make changeLine() a bit more resistant to unforseen line count values (i.e. 0) and a bit more general
2013-04-24 17:26:09 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
3c2c897cac
CHUI-916 FIXED Clear mMisspellRanges if spell check is not needed.
2013-04-12 20:27:28 +03:00
0f24668b0a
Merged in Chui beta6+ fixes
2013-03-29 10:37:58 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
da8f2ffb16
CHUI-855 FIXED Text entry bar auto expand does not resize
2013-03-28 04:52:24 +02:00
04372382d6
CHUI-846 ([crashhunters] crash in LLFontGL::maxDrawableChars): Added logging for bug to further track down problem when it occurs. Need to debug further based off information.
2013-03-26 00:29:53 -07:00
f2948cb1eb
Merge with viewer-chui
2013-03-20 17:53:51 -05:00
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
c294c7c474
CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on Linux
2013-03-16 16:09:50 -07:00
9150757c81
More fixes for gcc-4.6 breakage
2013-03-13 21:01:50 +00:00
1586107e87
SH-3944 WIP CHUI merge fixing
...
re-introduced don's refactor of low-level openGL calls pulling out of llui
and putting them into llrender. Took the new code from their updated versions
from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12 22:34:15 +00:00
e8b8a12b73
Mods to make compile on gcc 4.6.3 work mo betta
2013-03-12 10:48:05 -07:00
Tank_Master