| Age | Commit message (Collapse) | Author | 
|---|
|  | # Conflicts:
#	indra/newview/llagentwearables.cpp
#	indra/newview/llvoicevivox.cpp | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | DRTVWR-481
Merge | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | browser behind menu | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | no other changes made | 
|  |  | 
|  | Reverted previous two fixes and modified LLTextBase::changeLine() | 
|  |  | 
|  | sections. Since the background color can be changed by the user, this ensures distinctive highlighting | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats | 
|  | 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 | 
|  |  | 
|  | another attempt to move mem stat into base class | 
|  | Chat history is marked as untrusted source now. | 
|  | stat definition as they don't work on gcc/clang | 
|  | also, removed LLTrace::init and cleanup
removed derived class implementation of memory stat for LLMemTrackable
is automatic now | 
|  | Added callback for friendship checking | 
|  |  | 
|  |  | 
|  | renamed LLView::handleVisibilityChange to onVisibilityChange to reflect
standard naming conventions for handlers vs. reactors | 
|  |  | 
|  |  | 
|  |  |