Commit Graph

2242 Commits (22a851663cddecced21acd88ed8ae4fa9fc733fd)

Author SHA1 Message Date
Oz Linden 63d04204a9 merge changes for DRTVWR-203 2012-08-22 08:46:19 -04:00
Oz Linden c2e902d56a merge back beta fixes 2012-08-20 14:45:47 -04:00
Oz Linden 79bf2c4929 merge changes for storm-1879 2012-08-16 11:00:55 -04:00
Oz Linden 97106c2dea merge changes for DRTVWR-194 2012-08-15 17:07:10 -04:00
Todd Stinson 7cbbdbd896 PATH-849: CRASHFIX This should fix the crash caused by LLPathfindingObject::handleAvatarNameFetch being called after the corresponding LLPathfindingObject has been deleted. 2012-08-13 16:55:51 -07:00
Nat Goodspeed 559b39c5d1 Automated merge with http://hg.secondlife.com/viewer-development 2012-08-08 18:27:52 -04:00
Nat Goodspeed 50f3e227a2 Move llhandle.h into llcommon; same generality as llpointer.h.
Leaving llhandle.h in llui restricts the set of viewer project directories
which could potentially use it, and there's nothing whatsoever UI-specific
about it.
2012-08-08 13:23:02 -04:00
simon@Simon-PC.lindenlab.com 09cb8a4780 Merge with lindenlab/viewer-development 2012-08-03 10:20:47 -07:00
simon@Simon-PC.lindenlab.com 83f5d0c616 Merge in viewer-development 2012-07-31 15:42:02 -07:00
Brad Payne (Vir Linden) 58d5e223b8 merge 2012-07-30 15:02:02 -04:00
Brad Payne (Vir Linden) a5c9d89b28 merge 2012-07-30 14:57:33 -04:00
Nat Goodspeed e4dadaf205 Automated merge with http://hg.secondlife.com/viewer-development 2012-07-28 09:52:11 -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 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 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 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
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
Brad Payne (Vir Linden) 74d4f8af01 v-r to drano merge conflicts wip 2012-06-26 16:43:58 -04:00
Kelly Washington 0ee53b21d2 MAINT-30 Estate access lists for groups and residents are blank when "Allow public access" is checked.
MAINT-1200 Resident names not sorted in About Land (or Estate management) floater's allowed/banned boxes
reviewed with Simon
2012-06-25 13:41:53 -07:00
MartinRJ Fayray e35f3b7db4 STORM-1879: Inventory gear menu remains on screen after floater is closed 2012-06-25 05:09:22 +02:00
Todd Stinson 6e710333e7 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-06-22 18:59:31 -07:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Oz Linden 4397516ca5 merge changes for DRTVWR-168 2012-06-21 17:50:41 -04:00
Oz Linden f64a79d9d1 merge changes for DRTVWR-171 2012-06-21 14:19:25 -04:00
Kitty Barnett 8ef14ffb29 STORM-1887 FIXED Added words are not saved in dictionaries if main dictionary was reselected
The user's custom dictionary and ignore list are now independent of the primary dictionary.
2012-06-19 21:48:45 +02:00
Dave Parks 99dc246ac8 Merge 2012-06-15 14:29:46 -05:00
Todd Stinson 32063b5999 EXP-1953: Altering the behavior of building an LLTextBase such that icons are appended in place rather than prepended out of context. 2012-06-12 16:58:59 -07:00
Oz Linden eb227e4dbc merge spelling changes for UI review 2012-06-11 16:15:31 -04:00
Kitty Barnett d96d3d5256 STORM-276 Added the ability to remove (user-installed) dictionaries 2012-06-11 17:37:06 +02:00
Kitty Barnett 53bd3ada86 STORM-276 Distinguish between default dictionaries and user-installed dictionaries 2012-06-11 16:04:24 +02:00
Kitty Barnett 80b1a2c0a8 STORM-276 Insert braces around if/for/while loops 2012-06-11 13:39:45 +02:00
Brad Payne (Vir Linden) 6ee0456220 merge 2012-06-04 15:28:08 -04:00
Oz Linden ef962b37e9 merge dictionary import 2012-06-04 10:24:36 -04:00
Kitty Barnett 20210455f5 STORM-276 Dictionary import functionality and floater 2012-06-04 16:10:32 +02:00
Oz Linden 3329291a5e merge latest fixes from Kitty 2012-06-01 09:27:23 -04:00
Kitty Barnett e2e33c0ed5 STORM-276 FIXED Last word in a line editor isn't spell checked 2012-05-31 20:47:14 +02:00
Oz Linden 925db41711 merge changes for storm-276 2012-05-31 14:26:15 -04:00
Kitty Barnett d7303541cc STORM-276 FIXED Line editor misspells are checked every frame 2012-05-31 17:37:19 +02:00
Kitty Barnett 76234b4825 STORM-276 FIXED "Add to Ignore" doesn't trigger 2012-05-31 17:08:14 +02:00
Kitty Barnett e4c54afec2 Merged with viewer-release 2012-05-30 22:09:17 +02:00
Oz Linden f09bd7669f merge up to 3.3.2-release 2012-05-30 13:55:53 -04:00
Todd Stinson f83fcc357f Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-05-25 18:44:47 -07:00
simon@Simon-PC.lindenlab.com 1777fa5187 Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148 2012-05-25 15:07:22 -07:00
Oz Linden 1d01ad1162 merge changes for DRTVWR-151 2012-05-24 20:35:25 -04:00
Oz Linden 1f0addf6e4 merge changes for DRTVWR-152 2012-05-22 16:26:00 -04:00
Oz Linden 7637acf76e merge changes for DRTVWR-149 2012-05-22 06:03:42 -04:00
Kitty Barnett 1300f77fdd Merged with viewer-beta 2012-05-20 17:41:00 +02:00