Commit Graph

1623 Commits (ca7abc4c3be9310f4e5fec00b7d6ffadaba58ff0)

Author SHA1 Message Date
Todd Stinson 6d84272d38 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-08-23 15:11:10 -07:00
Todd Stinson 268d5bd4bd Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development. 2012-08-09 17:04:00 -07:00
Todd Stinson 9488baada3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-08-09 12:06:09 -07:00
simon@Simon-PC.lindenlab.com 09cb8a4780 Merge with lindenlab/viewer-development 2012-08-03 10:20:47 -07:00
Richard Linden 118e3b33bd CHUI-270 FIX Progress spinner not visible in merchant outbox 2012-08-03 17:43:48 -07:00
Brad Payne (Vir Linden) bf6bbe4642 MAINT-515 FIX, CHOP-100 FIX - technically we are avoiding these issues rather than fixing them; changing llcommon to be statically linked avoids the symbol issues with llcommon.dll 2012-08-02 11:45:38 -04:00
simon@Simon-PC.lindenlab.com 83f5d0c616 Merge in viewer-development 2012-07-31 15:42:02 -07:00
Nat Goodspeed e4dadaf205 Automated merge with http://hg.secondlife.com/viewer-development 2012-07-28 09:52:11 -04:00
Oz Linden b8bac66a0f increment version to 3.4.1 2012-07-27 16:22:33 -04: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
Oz Linden f8374e0f1f increment version to 3.4.0 2012-07-25 16:23:10 -04:00
Oz Linden 8df3619621 merge to viewer-developmento 2012-07-24 10:51:37 -04:00
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
Nat Goodspeed 27cbfef026 MAINT-1175: Use workaround for comparing std::type_info* on gcc < 4.4.
We now specialize std::less<const std::type_info*> to use
std::type_info::before(), and on Windows and Mac that Just Works. It even
works on Linux when using gcc 4.4+: more recent implementations of gcc's
std::type_info::before() apparently do name()-string comparisons internally.
It doesn't work so well on Linux with gcc 4.1, though, and that's the compiler
we still use on our Linux build-farm machines. But rather than give up,
perform explicit name()-string comparison in that case.
2012-07-19 08:35:11 -04: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 5e1e44ca7e MAINT-1175: merge backout LLRegistrySingleton<std::type_info::name()> 2012-07-18 16:31:22 -04:00
Nat Goodspeed 7f609b6a69 Backed out changeset a25bfa87418d (using std::type_info::name())
The changeset above touched every consumer of the two LLRegistrySingletons
originally defined with std::type_info* as keys. Those two
LLRegistrySingletons were changed to use const char* as keys, then all
consumers were changed to pass std::type_info::name() instead of the plain
std::type_info* pointer -- to deal with the observed fact that on Linux, a
given type might produce different std::type_info* pointers in different load
modules. Since then, Richard turned up the fascinating fact that at least some
implementations of gcc's std::type_info::before() method already accommodate
this peculiarity. It seems worth backing out the (dismayingly pervasive)
change to see if properly using std::type_info::before() as the map comparator
will work just as well, with conceptually simpler source code.
This backout is transitional: we don't expect things to build/run properly
until we've cherry-picked certain other pertinent changes.
2012-07-18 15:51:34 -04:00
Nat Goodspeed 55a7bdf8d3 MAINT-1175: Pass boost::unordered_map hash/equals functors for char*.
boost::unordered_map<const char*, ...> does NOT, by default, "do the right
thing." Give it hash and equality functors that do.
2012-07-16 21:05:23 -04:00
Nat Goodspeed 79a171209f MAINT-1175: Linux viewer built on TC is broken, built on dev box works.
Try to diagnose the cause of the misbehavior with a BOOST_STATIC_ASSERT.
2012-07-12 13:19:26 -04:00
simon@Simon-PC.lindenlab.com 173d0fa213 Pull in viewer-development because it's painful. Merge with runitai's help. 2012-07-11 16:15:23 -07: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 18bd525d00 MAINT-1175: Forbid LLRegistry[Singleton]<std::type_info*, ...>.
Back out code that selects LLTypeInfoLookup for the underlying map
implementation when KEY = [const] std::type_info*, because LLTypeInfoLookup's
API is changing to become incompatible with std::map. Instead, fail with
STATIC_ASSERT when LLRegistry's KEY is [const] std::type_info*.
Fix all existing uses to use std::type_info::name() string instead.
2012-07-11 08:14:34 -04:00
Nat Goodspeed 7003527409 MAINT-1175: Still grappling with MSVC idiosyncracies.
Maybe it's failing to correctly handle overloaded transform() methods?
2012-07-10 17:29:58 -04:00
Nat Goodspeed 00ae56334c MAINT-1175: Fix Windows build.
It seems MSVC doesn't like boost::make_transform_iterator() in the context I
was using it. Try directly invoking the iterator's constructor.
2012-07-10 16:41:26 -04:00
Nat Goodspeed b6ffedb03d MAINT-1175: Reimplement LLTypeInfoLookup for better lookup failure.
The original LLTypeInfoLookup implementation was based on two assumptions:
small overall container size, and infrequent normal-case lookup failures.
Those assumptions led to binary-searching a sorted vector, with linear search
as a fallback to cover the problem case of two different type_info* values for
the same type. As documented in the Jira, this turned out to be a problem. The
container size was larger than expected, and failed lookups turned out to be
far more common than expected.
The new implementation is based on a hash map of std::type_info::name()
strings, which should perform equally well in the success and failure cases:
no special-case fallback logic.
2012-07-10 15:46:27 -04:00
simon@Simon-PC.lindenlab.com a96a260a4d Merge simon/viewmaster-merge for latest maint work 2012-06-29 13:53:35 -07:00
Dave Parks bedbbf7c02 Merge 2012-06-28 16:32:54 -05:00
Dave Parks ed72fd0ae9 merge 2012-06-28 13:22:04 -05:00
simon@Simon-PC.lindenlab.com 1ca7d3a57e MAINT-1173 : Top Scripts: Break down usage by parcel. Follow-on code to add
per-parcel filtering.  Reviewed by Kelly
2012-06-27 13:58:37 -07:00
Oz Linden 2c3e78f1f1 merge changes for DRTVWR-167 2012-06-27 14:18:22 -04:00
Oz Linden ec730b6600 merge to latest viewer-development-havokai 2012-06-26 13:28:19 -04:00
Todd Stinson bf1c1947d7 PATH-743: Updating the cursors for path testing mode to final designs. 2012-06-25 14:28:21 -07:00
Oz Linden 0f958faacd merge up to 3.3.3-release + pathfinding 2012-06-25 17:16:29 -04:00
Oz Linden cce8cd7341 increment version to 3.3.5 2012-06-25 16:58:53 -04:00
Oz Linden f92e7d30a8 Add logging during tests (debug level, to test-specific files) 2012-06-24 07:27:34 -04:00
Todd Stinson 6e710333e7 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-06-22 18:59:31 -07:00
Brad Payne (Vir Linden) ba4c4bcbd1 merge 2012-06-22 15:53:28 -04:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Todd Stinson 11b6e272ab PATH-743: Altering the mouse cursor to give more feed back when in path testing mode. 2012-06-21 16:39:35 -07:00
Oz Linden 4397516ca5 merge changes for DRTVWR-168 2012-06-21 17:50:41 -04:00
Dave Parks 99dc246ac8 Merge 2012-06-15 14:29:46 -05:00
Merov Linden b4a53226c8 Merge pull from richard/viewer-chui 2012-06-08 10:40:32 -07:00
Oz Linden 32943b1d99 merge changes for DRTVWR-164 2012-06-08 12:09:45 -04:00
Merov Linden bc54f1bb89 Merge : pull from lindenlab/viewer-release 2012-06-07 22:30:54 -07:00
Seth ProductEngine 9b92235291 CHUI-120 WIP Added conversations participants drag and drop from avatar lists to IM floaters.
- Added new drag and drop type DAD_PERSON and source SOURCE_PEOPLE to avoid highliting the toolbars when using SOURCE_VIEWER.
- Disabled calling card drop support as it is considered obsolete.
2012-06-08 01:08:58 +03:00
Nat Goodspeed 166f75d91f MAINT-1144: Defend against NULL LLPluginProcessParent::mProcess.
The change from LLProcessLauncher to LLProcess introduces the possibility of a
NULL (default-constructed) LLProcessPtr. Add certain static LLProcess methods
accepting LLProcessPtr, forwarding to nonstatic method when non-NULL but doing
something reasonable with NULL. Use these methods in LLPLuginProcessParent.
2012-06-06 16:38:16 -04:00
Brad Payne (Vir Linden) 542975b4c6 merge 2012-06-04 16:19:18 -04:00
prep ef75a2e07e WIP:Displaying physics capsule for a character - it is currently disabled. 2012-05-31 16:38:19 -04:00