summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Expand)Author
2012-08-15merge changes for DRTVWR-194Oz Linden
2012-08-13PATH-849: CRASHFIX This should fix the crash caused by LLPathfindingObject::h...Todd Stinson
2012-08-08Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-08-08Move llhandle.h into llcommon; same generality as llpointer.h.Nat Goodspeed
2012-08-03Merge with lindenlab/viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-31Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-28Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-18MAINT-1175: Ditch LLTypeInfoLookup, make map<const type_info*> work.Nat Goodspeed
2012-07-18MAINT-1175: merge backout LLRegistrySingleton<std::type_info::name()>Nat Goodspeed
2012-07-18Backed out changeset a25bfa87418d (using std::type_info::name())Nat Goodspeed
2012-07-11MAINT-1175: Properly pass LLRegistry's COMPARATOR to underlying map.Nat Goodspeed
2012-07-11MAINT-1175: Forbid LLRegistry[Singleton]<std::type_info*, ...>.Nat Goodspeed
2012-08-03Merge back changes from viewer-lion with latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-01Merge back viewer-lion, which has viewer-development and down-stream fixessimon@Simon-PC.lindenlab.com
2012-07-17MAINT-1276: Add ability to paste LSL tooltips into scripts. Reviewed by Kellysimon@Simon-PC.lindenlab.com
2012-06-29Merge simon/viewmaster-merge for latest maint worksimon@Simon-PC.lindenlab.com
2012-06-28MergeDave Parks
2012-06-26v-r to drano merge conflicts wipBrad Payne (Vir Linden)
2012-06-25MAINT-30 Estate access lists for groups and residents are blank when "Allow p...Kelly Washington
2012-06-25STORM-1879: Inventory gear menu remains on screen after floater is closedMartinRJ Fayray
2012-06-22Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-06-22mergeDave Parks
2012-06-21merge changes for DRTVWR-168Oz Linden
2012-06-21merge changes for DRTVWR-171Oz Linden
2012-06-19STORM-1887 FIXED Added words are not saved in dictionaries if main dictionary...Kitty Barnett
2012-06-15MergeDave Parks
2012-06-12EXP-1953: Altering the behavior of building an LLTextBase such that icons are...Todd Stinson
2012-06-11merge spelling changes for UI reviewOz Linden
2012-06-11STORM-276 Added the ability to remove (user-installed) dictionariesKitty Barnett
2012-06-11STORM-276 Distinguish between default dictionaries and user-installed diction...Kitty Barnett
2012-06-11STORM-276 Insert braces around if/for/while loopsKitty Barnett
2012-06-04mergeBrad Payne (Vir Linden)
2012-06-04merge dictionary importOz Linden
2012-06-04STORM-276 Dictionary import functionality and floaterKitty Barnett
2012-06-01merge latest fixes from KittyOz Linden
2012-05-31STORM-276 FIXED Last word in a line editor isn't spell checkedKitty Barnett
2012-05-31merge changes for storm-276Oz Linden
2012-05-31STORM-276 FIXED Line editor misspells are checked every frameKitty Barnett
2012-05-31STORM-276 FIXED "Add to Ignore" doesn't triggerKitty Barnett
2012-05-30Merged with viewer-releaseKitty Barnett
2012-05-30merge up to 3.3.2-releaseOz Linden
2012-05-25Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-05-25Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148simon@Simon-PC.lindenlab.com
2012-05-24merge changes for DRTVWR-151Oz Linden
2012-05-22merge changes for DRTVWR-152Oz Linden
2012-05-22merge changes for DRTVWR-149Oz Linden
2012-05-20Merged with viewer-betaKitty Barnett