summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-05-11Fix callback signal, Eliminate some unnecessary staticsCinder
2014-05-07Merge up.Cinder
2014-05-07Code policyCinder
2014-05-07merge changes for DRTVWR-363Oz Linden
2014-05-07correct bad merges from 3.7.7-releaseOz Linden
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-05-06Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2014-05-06increment viewer version to 3.7.8Oz Linden
2014-05-06Let's get started: some code policy cleanup, reference arguments where we ↵Cinder
can, correct spelling
2014-04-30Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2014-04-23merge changes for STORM-1831Oz Linden
2014-04-22catch a few more cases of STANDALONE -> USESYSTEMLIBSOz Linden
2014-04-22merge changes for OPEN-199Oz Linden
2014-04-22merge changes for STORM-1915Oz Linden
2014-04-22merge changes for STORM-2023Oz Linden
2014-04-22MergeXiaohong Bao
2014-04-22merge up to 3.7.6-releaseOz Linden
2014-04-21merge changes for 3.7.6-releaseOz Linden
2014-04-21increment viewer version to 3.7.7Oz Linden
2014-04-21Another oops windows build fix.Cinder
2014-04-21Windows build fix.Cinder
2014-04-18Reinstate support text appendText() in LLFloaterAboutCinder
2014-04-18Remove clearHighlights()Cinder
2014-04-18Move some more script editor functions from LLTextEditor to LLScriptEditorCinder
2014-04-18Fix header guardCinder
2014-04-18Remove calls to now unused methodsCinder Biscuits
2014-04-18STORM-2023: Restore system color picker on OSXCinder Biscuits
2014-04-18Trivial typo fixCinder
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-16Undo of overzealous removal.Aura Linden
2014-04-16Orphaned definitionCinder
2014-04-16bool not U32Cinder
2014-04-15maint-5707 window should no longer be displayed.Aura Linden
2014-04-15Disabled 'Sending to server Try N' messages from crash reporting.Aura Linden
2014-04-15Merges in fix for Maint-5707Aura Linden
2014-04-14Fix for MAINT-5707 bad breakpad behavior with teleport linksAura Linden
2014-04-08revived some deleted files to get mac build workingRichard Linden
2014-04-08merge changes for 3.7.5-releaseOz Linden
2014-04-08merge latest changes from ImaOz Linden
2014-04-08merge changes for 3.7.5-releaseOz Linden
2014-04-07fix for build errors...removed duplicate definition of getpid on windowsRichard Linden
2014-04-07merge with releaseRichard Linden
2014-04-07Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-07Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2014-04-07increment viewer version to 3.7.6Oz Linden
2014-03-28storm-1831: Fixing the remaining LL_ERRS.Ima Mechanique
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-26storm-1831 Removing the callback after first region crossing. Prevents ↵Ima Mechanique
repeated callbacks after highlighting has been removed for live script.