Commit Graph

42 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
callum_linden 41712d35fb Update to build on Xcode 6.0: additional scoping required for clang 2014-10-17 13:40:15 -07:00
Stinson Linden fdc787cc06 MAINT-4009: Patching a memory leak of ParamDescriptor objects. 2014-05-24 00:05:02 +01:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Richard Linden 813bc232e7 MAINT-3017 FIX Inventory filter for Recent tab does not persist between sessions as it used to.
added names back to inventory filters, so they can be deserialized
2013-12-09 15:42:51 -08:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Graham Linden f638fc803d MAINT-3046 fix test regression from debug llassert accidentally checked in with crash fix 2013-08-23 17:34:30 -07:00
Graham Madarasz (Graham Linden) 19726783cd MAINT-3046 make LLNotifications clear out vecs of LLNotificationChannelPtr so singleton cleanup doesn't do things it really ought not do 2013-08-23 14:44:46 -07:00
Richard Linden e40065f82c BUILDFIX: #include and dependency cleanup 2013-07-19 15:03:05 -07:00
Richard Linden 042b7aec26 BUILDFIX: fixed llviewerassetstats test and render2dutils changes
that were dropped in merge
2013-06-05 20:25:21 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 68f9f656cd merge with viewer-release 2013-03-22 00:44:59 -07:00
Richard Linden 0cd94a4dd5 Automated merge with https://bitbucket.org/lindenlab/viewer-chui 2013-02-18 20:38:27 -08:00
Richard Linden 45849294ce CHUI-739 FIX FUI toolbars not displayed when switching between CHUI and release viewer
param blocks no longer write enums as ints
2013-02-18 20:30:22 -08:00
AlexanderP ProductEngine 638d94eef7 CHUI-739 : Clean up : FUI toolbars not displayed when switching between CHUI and release viewer 2013-02-14 18:51:13 +02:00
AlexanderP ProductEngine c7cac7896e CHUI-739 Fixed! FUI toolbars not displayed when switching between CHUI and release viewer : parsing declare values of Enums 2013-02-13 20:44:38 +02:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Richard Linden 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
William Todd Stinson c9044c03b3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-09 18:51:23 -08:00
Richard Linden 0007114cf5 SH-3499 WIP Ensure asset stats output is correct
fixed copy behavior of recordings and accumulator buffers
2012-11-05 16:10:57 -08:00
Richard Linden f8eaee7531 SH-3499 Ensure asset stats output is correct
improvements to predicate API
default rules encapsulated in LLInitParam
removed empty flag from viewer asset stats
2012-11-02 20:03:44 -07:00
Richard Linden bb6bda9eef SH-3499 Ensure asset stats output is correct
added support for specifying predicates for xui and llsd serialization
2012-11-01 19:55:06 -07:00
Richard Linden 3ffd0be53a SH-3405 WIP convert existing stats to lltrace system
fixed llpredicate so that values and rules work uniformly with predicate logic
and/or/negate works in parallel with set/clear
2012-10-26 20:03:33 -07:00
Richard Linden 7f97aa2d5d SH-3405 WIP convert existing stats to lltrace system
fixed crash on exit
2012-10-25 17:30:03 -07:00
Richard Linden 638a16eedd SH-3405 WIP convert existing stats to lltrace system
improved predicate system, added uncertain/unknown predicates
2012-10-23 22:35:47 -07:00
Richard Linden ae3e4fee37 Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting 2012-10-22 22:51:28 -07:00
Richard Linden 50ad343366 SH-3405 WIP convert existing stats to lltrace system
added return value to serialize function to track if any values were written
2012-10-22 22:46:45 -07:00
Richard Linden d6634fcd24 SH-3405 WIP convert existing stats to lltrace system
sanitized param block code to accept isValid and isProvided at any point
added predicates to control serialization
2012-10-22 19:54:10 -07:00
Richard Linden 176ffa54b4 SH-3405 WIP convert existing stats to lltrace system
finished most of conversion of llviewerassetstats
ported some param block fixes from viewer-chui
converted viewer asset stats to param block format
2012-10-19 19:35:01 -07:00
Richard Linden 56f7472816 MAINT-1556 FIX LLSD param blocks should accept enum values
fix for gcc builds
2012-09-12 16:16:49 -07:00
Richard Linden e2c48e65f2 MAINT-1556 FIX LLSD param blocks should accept enum values
always parse named values first
added detection of enum-type values and now parse as ints
2012-09-11 17:33:33 -07:00
Todd Stinson 268d5bd4bd Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development. 2012-08-09 17:04:00 -07:00
Richard Linden 118e3b33bd CHUI-270 FIX Progress spinner not visible in merchant outbox 2012-08-03 17:43:48 -07:00
Todd Stinson c1aa0cc4fc Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-07-27 15:38:03 -07:00
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
Nat Goodspeed 2e83dfa217 MAINT-1175: Ditch LLTypeInfoLookup, make map<const type_info*> work.
Instead of forbidding std::map<const std::type_info*, ...> outright (which
includes LLRegistry<const std::type_info*, ...> and LLRegistrySingleton<const
std::type_info*, ...>), try to make it work by specializing std::less<const
std::type_info*> to use std::type_info::before().
Make LLRegistryDefaultComparator<T> use std::less<T> so it can capitalize on
that specialization.
2012-07-18 20:33:54 -04:00
Nat Goodspeed 709c1eeae9 MAINT-1175: Properly pass LLRegistry's COMPARATOR to underlying map.
Although LLRegistry and LLRegistrySingleton have always defined a COMPARATOR
template parameter, it wasn't used for the underlying map. Therefore every
type, including any pointer type, was being compared using std::less. This
happens to work most of the time -- but is tripping us up now.
Pass COMPARATOR to underlying std::map. Fix a couple minor bugs in
LLRegistryDefaultComparator (never before used!). Specialize for const char*.
Remove CompareTypeID and LLCompareTypeID because we now actively forbid using
LLRegistry<std::type_info*, ...>; remove only known reference
(LLWidgetNameRegistry definition).
2012-07-11 14:13:45 -04:00
Nat Goodspeed 578d70dec0 MAINT-1175: Change LLTypeInfoLookup API for future optimizations.
Per discussion with Richard, accept the type key for insert() and find() as a
template parameter rather than as std::type_info*. This permits (e.g.) some
sort of compile-time prehashing for common types, without changing the API.
Eliminate iterators from the API altogether, thus avoiding costs associated
with transform_iterator.
Fix existing references in llinitparam.h.
2012-07-11 08:20:14 -04:00
Nat Goodspeed a5b0147df4 Automated merge with http://hg.secondlife.com/viewer-release 2012-05-09 22:33:04 -04:00
Nat Goodspeed 5459f2ee98 Fix Linux UI issues introduced by moving llinitparam to llcommon.
In a number of places, the viewer uses a lookup based on std::type_info*. We
used to use std::map<std::type_info*, whatever>. But on Linux,
&typeid(SomeType) can produce different pointer values, depending on the
dynamic load module in which the code is executed. Introduce
LLTypeInfoLookup<T>, with an API that deliberately mimics
std::map<std::type_info*, T>. LLTypeInfoLookup::find() first tries an
efficient search for the specified std::type_info*. But if that fails, it
scans the underlying container for a match on the std::type_info::name()
string. If found, it caches the new std::type_info* to optimize subsequent
lookups with the same pointer.
Use LLTypeInfoLookup instead of std::map<std::type_info*, ...> in
llinitparam.h and llregistry.h.
Introduce LLSortedVector<KEY, VALUE>, a std::vector<std::pair<KEY, VALUE>>
maintained in sorted order with binary-search lookup. It presents a subset of
the std::map<KEY, VALUE> API.
2012-04-11 11:01:00 -04:00
Richard Linden 4287dcaacf moved LLSDParam to llcommon so that LLSD<->Param Block conversion are usable by everyone 2012-01-20 14:55:39 -08:00
Richard Linden 057da807ac removed LLXUIXML library
moved LLInitParam, and LLRegistry to llcommon
moved LLUIColor, LLTrans, and LLXUIParser to llui
reviewed by Nat
2012-01-20 13:51:46 -08:00