Commit Graph

24524 Commits (261c10adf3fafc9211e46fdefe41cfdece459d0f)

Author SHA1 Message Date
Oz Linden 261c10adf3 merge changes for DRTVWR-188 2012-08-07 19:42:45 -07:00
Oz Linden fba9c9e8dd tag merge of DRTVWR-188 2012-08-07 19:42:04 -07:00
Oz Linden 2571809dc0 tag merge of DRTVWR-181 2012-08-07 17:05:30 -07:00
simon@Simon-PC.lindenlab.com 09cb8a4780 Merge with lindenlab/viewer-development 2012-08-03 10:20:47 -07:00
Oz Linden 7fa426f4db tag merge of DRTVWR-186 2012-08-02 13:09:39 -04:00
eli f7861f2828 FIX INTL-100 Frrench linguistic fixes 2012-08-01 16:21:58 -07:00
eli 46f10dccb6 sync with viewer-dev for 'fr' 2012-08-01 13:40:39 -07:00
eli 4376848e15 sync with viewer-dev for 'ja' 2012-08-01 13:38:21 -07:00
eli 634756de49 sync with viewer-dev for changes and new files for 'en' 2012-08-01 13:23:10 -07:00
eli 429726a1dd sync with viewer-dev, removing obsolete files 2012-08-01 13:20:43 -07:00
simon@Simon-PC.lindenlab.com 92a0db2a4f Merge MAINT-1270 fix 2012-08-01 13:17:35 -07: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
Nat Goodspeed f37d109e25 Automated merge with ssh://hg.lindenlab.com/nat/viewer-maint-1175 2012-07-28 09:48:18 -04:00
eli 123cc80411 sync with viewer-release 2012-07-27 19:48:40 -07:00
Richard Linden fd7bfb03c9 MAINT-1175 FIX Severe performance issues on 3.3.2 (258114) Release and 3.3.3 (259197) Beta in "Add scroll list item"
removed linear scan for namelist items and used weak reference (LLHandle) instead
2012-07-27 15:18:29 -07:00
Oz Linden b8bac66a0f increment version to 3.4.1 2012-07-27 16:22:33 -04:00
Oz Linden 1869a399be Added tag 3.4.0-beta1 for changeset 1f27cdfdc542 2012-07-27 14:58:38 -04:00
Oz Linden 124f45d20e another change to force a new ticket, disable some codeticket features 2012-07-25 21:16:09 -04:00
Oz Linden 6059ac5f6c clean up BuildParams and change to force a new ticket 2012-07-25 18:22:48 -04:00
Oz Linden f8374e0f1f increment version to 3.4.0 2012-07-25 16:23:10 -04:00
Oz Linden 20d7de14fd tag merge of DRTVWR-182 2012-07-25 13:58:48 -04:00
Oz Linden 33afaadf5b pull latest pathfinding changes from integration branch 2012-07-25 12:31:57 -04:00
Oz Linden 01b7959e01 update to latest builds of llphysicsextensionss 2012-07-25 12:31:16 -04:00
Todd Stinson b8cca9c6e6 Adding a group identifier to the group objects in the pathfinding linksets and characters floaters. 2012-07-24 17:50:24 -07:00
Oz Linden ef37311e9e merge up to latest viewer-pathfinding (including 3.3.4) 2012-07-24 13:11:14 -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
Todd Stinson e7e0e514fd PATH-781: Pulling in the new 'owner_is_group' field into the pathfinding object. 2012-07-23 17:12:45 -07:00
Oz Linden d7015a2b9b pull back 3.3.4 release tag 2012-07-23 16:26:24 -04:00
Oz Linden 3645669241 Added tag 3.3.4-release for changeset 28e100d0379a 2012-07-23 16:05:14 -04:00
prep c3702aab3b Fix for path-826. Safeguarding against a mull weight being used 2012-07-23 14:25:44 -04:00
Oz Linden 42cc602732 fix finding havok libs in relwithdebinfo mode (uses release unless LL_DEBUG_HAVOK is used 2012-07-21 08:47:36 -07:00
Oz Linden 12b1ec6264 refactor to build llphysicsextensions_tpv package for sublicensees 2012-07-20 07:38:12 -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
Todd Stinson 843db677d1 Setting the description column of the linkset floater to be a fixed width. Having multiple dynamic width columns apparently prevents other columns from being manually resized by the user. 2012-07-18 16:25:05 -07:00
Todd Stinson 856827de23 Updating the build tools floater to better handle multi-line creator and owner names. 2012-07-18 14:12:32 -07: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
Oz Linden c3d1ed5b76 merge back fixes from 3.3.4-beta5 2012-07-18 05:52:01 -07:00
Oz Linden 9643dee27e Added tag 3.3.4-beta5 for changeset ab2ffc547c8a 2012-07-18 05:41:55 -07:00
Oz Linden f26dfe4fb9 merge changes for DRTVWR-184 2012-07-18 03:10:25 -04:00
Oz Linden a93cb07df6 tag merge of DRTVWR-184 2012-07-18 03:09:09 -04:00
Todd Stinson 0e592855eb Updating to the latest llphysicsextension source package. 2012-07-17 19:06:35 -07:00
Dave Parks 636e20be10 MAINT-1223 More aggressive rebuilding of render batches when alpha color values change. 2012-07-17 13:00:33 -05:00
Oz Linden 3803a5b5ae pull back fixes for 3.3.4-beta4 2012-07-17 13:21:36 -04:00
Oz Linden c906d64004 Added tag 3.3.4-beta4 for changeset 6c75f220b103 2012-07-17 13:18:12 -04:00
Oz Linden e49faf96aa merge changes for DRTVWR-183 2012-07-17 12:16:37 -04:00
Oz Linden 291be17078 tag merge of DRTVWR-183 2012-07-17 12:16:22 -04:00