summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Collapse)Author
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-12MAINT-4009: Patching a minor leak for when the status text box for the ↵Stinson Linden
folder view has not been reparented.
2014-05-07Merge up.Cinder
2014-05-07Code policyCinder
2014-05-07Merge downstream version 3.7.8 codesimon
2014-05-07merge changes for DRTVWR-363Oz Linden
2014-05-07correct bad merges from 3.7.7-releaseOz Linden
2014-05-07Merge with 3.7.7-releasedolphin
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-07MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field.maksymsproductengine
2014-05-07Merge downstream version 3.7.8 codesimon
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-05-06Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2014-05-06Let's get started: some code policy cleanup, reference arguments where we ↵Cinder
can, correct spelling
2014-05-05MAINT-4009: Patching a small memory leak for when menu items were being ↵Stinson Linden
created before the viewer window initialization had created the menu holder. Also, added llasserts in other cases when referencing the menu holder to ensure the holder is non-null.
2014-05-02MAINT-4009: Patching the memory leak occurring in the scenario where avatar ↵Stinson Linden
icon was being created, but the tab container did not have a button to accept the gieven icon.
2014-04-30MAINT-4009: Patching the LLTabContainer that was leaking some child views ↵Stinson Linden
and their associated llimage allocations.
2014-04-30Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2014-04-30MAINT-4009: Patching another memory leak in LLBadgeOwner that indirectly was ↵Stinson Linden
also causing leaks in llimage.
2014-04-29MAINT-3975 FIX Group Invitation window omits ? button for listed residents ↵Richard Linden
(INTEREST LIST RC only)
2014-04-23merge changes for STORM-1831Oz Linden
2014-04-22Merge with 3.7.6-releasedolphin
2014-04-22merge changes for OPEN-199Oz Linden
2014-04-22MergeXiaohong Bao
2014-04-22merge up to 3.7.6-releaseOz Linden
2014-04-22mergeBrad Payne (Vir Linden)
2014-04-21Merge downstream codesimon
2014-04-21Merge downstream code updating version to 3.7.7simon
2014-04-18Move some more script editor functions from LLTextEditor to LLScriptEditorCinder
2014-04-18Begin moving script editor portions of LLTextEditor to their own derived class.Cinder
This should fix the run off segment bugs by not overriding LLTextBase::clearSegments() in LLTextEditor TODO: Move the rest of the script stuff out of LLTextEditor for simplicity sake
2014-04-16Orphaned definitionCinder
2014-04-16bool not U32Cinder
2014-04-21Merge downstream codesimon
2014-04-08merge latest changes from ImaOz Linden
2014-04-01MAINT-1180 FIXED Cannot delete object description.andreykproductengine
2014-03-28strom-1831: Cleaning out commented and unused codeIma Mechanique
2014-03-28DRTVWR-363: Fix LLNotificationsListener::listChannels() channel walk.Nat Goodspeed
LLNotifications::ChannelMap went away when LLNotificationChannel became an LLInstanceTracker subclass. Iterate the universe of channels using LLNotificationChannel::beginInstances(), endInstances() instead. More troubling is that LLNotificationChannel::getParentChannelName() went away too. When LLNotificationChannel acquired a Params block and corresponding constructor, it acquired the ability to listen on multiple upstream sources. That meant that a single mParent string became inapplicable, and its access method was removed. (Curiously, mParent was not itself removed, but it was left unused.) Change mParent to mParents, a vector<string>, built by connectToChannel(). Introduce getParents(), an accessor returning an iterator_range over that vector. Change LLNotificationsListener::listChannels() to collect a "parents" key in the map returned for each channel, and -- for backwards compatibility -- capture the first entry in the "parents" array as "parent".
2014-03-27DRTVWR-363: re-enable commented-out LLNotificationsListener::listChannels()Nat Goodspeed
and its caller.
2014-03-21Fixed unit testdolphin
2014-03-19OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBSOz Linden
2014-03-19logging cleanup in support of debugging text editor problemsOz Linden
2014-03-17Updated experience cache to get a const reference to xp datadolphin
2014-03-14merge changes for 3.7.3-releaseOz Linden
2014-03-14STORM-1831 initialize LLKeywords::mLoaded in constructor (fixes ↵Oz Linden
black-on-black text in various places)
2014-03-14correct logging levels (ERR causes a crash), and a minor style fixOz Linden
2014-03-12mergeBrad Payne (Vir Linden)
2014-03-12merge with releaseRichard Linden
2014-03-11Merge downstream code to 3.7.4simon
2014-03-10Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-10Mergedolphin