summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-07Pulled viewer-vivox4.6 into this branch for future RC.Aura Linden
2014-04-07Merged viewer release into vivoxAura 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-04-07Added tag 3.7.5-release for changeset fc066b82343fOz 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-27Pulled merge from releaseAura Linden
2014-03-26storm-1831 Removing the callback after first region crossing. Prevents ↵Ima Mechanique
repeated callbacks after highlighting has been removed for live script.
2014-03-26Double init of logging probably due to merge fail.Aura Linden
2014-03-26Not ideal but sufficient.Aura Linden
2014-03-25MergedAura Linden
2014-03-25Still wasn't doing the right thing with log files.Aura Linden
2014-03-25It would help to specify the correct destination directory genius.Aura Linden
2014-03-25Fixed dumb mistake.Aura Linden
2014-03-24The simple approach has not worked. This hybrid solution should avoid the ↵Aura Linden
Windows issues and get us per-run logfiles.
2014-03-24Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-24merge with releaseRichard Linden
2014-03-24Old is the new new.Aura Linden
2014-03-24merge changes for 3.7.4-releaseOz Linden
2014-03-24Merged in viewer-release.Aura Linden
2014-03-24increment viewer version to 3.7.5Oz Linden
2014-03-24Added tag 3.7.4-release for changeset d076568ff788Oz Linden
2014-03-24merge changes for DRTVWR-360Oz Linden
2014-03-24Pulled merge from release.Aura Linden
2014-03-21remove some obsolete BuildParams entriesOz Linden
2014-03-21Current log was actually correct.Aura Linden
2014-03-20Returned Secondlife.log to main directory due to unforeseen LLErrorThread ↵Aura Linden
complexities.
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-18merge changes for STORM-2020Oz Linden
2014-03-18merge changes for STORM-2007Oz Linden
2014-03-18merge changes for STORM-1966Oz Linden
2014-03-17ACME-1376 : Take the location checkbox out of the photo panelMerov Linden
2014-03-17Restore use of RenderSpecularExponentOz Linden
2014-03-15Mac Debug build is functional with this manifest changeMonty Brandenberg
2014-03-14Consistent set of fmodex 4.44.31 builds now.Monty Brandenberg
2014-03-14Additions & fixes for lib copy, use only forwarded ptrs in LLAE interfaces.Monty Brandenberg
Copy3rdPartyLibs needed to copy the now-corrected fmodexL libraries and it had a bad library reference on Linux for release. In llaudio land, the audio engine interfaces, even the fmodex specializations, seem to want to be external-structure free so use a forward declaration and pointer to FMOD_DSP_DESCRIPTION and deal with it in the ctor/dtor.
2014-03-14Update fmodex to 4.44.31. Move DSP descriptor to heap storage.Monty Brandenberg
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-14merge changes for open-209Oz Linden
2014-03-14conform to new policy forbidding trigraphsOz Linden
2014-03-14merge changes for storm-2007Oz Linden
2014-03-14merge changes for storm-1920Oz Linden
2014-03-13OPEN-209: Corrected all instances of trigraphs in the code.Ricky Curtice
Trigraphs can cause some real special headaches. The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!