summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Expand)Author
2013-07-29merge changes for maint-2936Oz Linden
2013-07-29merge changes for storm-1838Oz Linden
2013-07-29merge storm-1958Oz Linden
2013-07-29STORM-1838 mergeJonathan Yap
2013-07-29STORM-1838 Add display name handling to the initial notificationJonathan Yap
2013-07-28STORM-1957 World Map - Land For Sale is missing L$ / sqmJonathan Yap
2013-07-26CHOP-955: merge viewer_manifest.py file_list fixNat Goodspeed
2013-07-26CHOP-955: Include app_settings/settings_install.xml in file_list.Nat Goodspeed
2013-07-26Automated merge with ssh://hg.lindenlab.com/nat/viewer-chop-951Nat Goodspeed
2013-07-26CHOP-962: merge code-review fixes with viewer-releaseNat Goodspeed
2013-07-26CHOP-962: per code review, comment that other code relies on "Global".Nat Goodspeed
2013-07-25CHOP-962: Make LLControlVariable::setPersist() accept only enum.Nat Goodspeed
2013-07-25Kill all the vivox logsAura Linden
2013-07-25VITA test framework - record events supportJeff (Gioffredo Linden)
2013-07-24added default sourceid and check that sourceid is not blank, hoping to get th...JJ Linden
2013-07-24merge up to latest snowstorm integration branchOz Linden
2013-07-24Improve envelope notification behavior when there is no toast to displayOz Linden
2013-07-23STORM-1958: Only draw the user's netmap dot onceCinder Roxley
2013-07-23Fix for BUG-3363. We have an array of URLs, and we need the paths of those U...Geenz
2013-07-23CHUI-986 FIXED Don't open Conversation floater for offline IMs if it's not fr...Mnikolenko ProductEngine
2013-07-22Automated merge with http://hg.secondlife.com/viewer-releaseNat Goodspeed
2013-07-22Turn off logging.Aura Linden
2013-07-17CHOP-962: Make LLControlGroup::declare* return LLControlVariable*Nat Goodspeed
2013-07-16CHOP-966: use 4 part version numbers for release notes urlsOz Linden
2013-07-16CHOP-960: Validate cmd_line.xml for map-to real settings.xml vars.Nat Goodspeed
2013-07-16merge changes for storm-1951Oz Linden
2013-07-15merge changes for CHOP-963Oz Linden
2013-07-15Remove trivial duplicate ; at the end of a lineCinders
2013-07-15STORM-1951: Only toast when we should, honor show_toast notification paramCinders
2013-07-15merge changes for storm-1952Oz Linden
2013-07-13CHOP-963: Add a new --update-service command line argument for QA useOz Linden
2013-07-11Merged in viewer-releaseAura Linden
2013-07-11Merge with latest viewer-release.Geenz
2013-07-11CHOP-959: Merge About-box changes with tipNat Goodspeed
2013-07-11OPEN-171: the save file dialog incorrectly uses type codes as extensionsGeenz
2013-07-11CHOP-959: Re-add global coordinates, plus SLURL, to About box.Nat Goodspeed
2013-07-11Fix a crash on 10.6.x due to auto layout not being supported in 10.6 nibs.Geenz
2013-07-09CHOP-963: Make update service query url depend on the grid rather than settingsOz Linden
2013-07-08STORM-1952: Fix name sometimes appearing as (waiting) by generating a slurl i...Cinders
2013-07-02CHOP-959: Merge region-local location change with tip.Nat Goodspeed
2013-07-02CHOP-959: Introduce CmdLineChannel settings var, map --channel to it.Nat Goodspeed
2013-07-02CHOP-959: Introduce CmdLineLoginLocation var for --url and --slurl.Nat Goodspeed
2013-07-02merge changes for storm-1953Oz Linden
2013-07-02merge changes for STORM-1948Oz Linden
2013-07-02CHOP-959: Report region-local position in Help -> About box.Nat Goodspeed
2013-07-02CHOP-959: add POSITION_LOCAL to LLFloaterAbout::getInfo() blob.Nat Goodspeed
2013-07-01CHOP-959: Introduce and use settings vars for some cmd_line switches.Nat Goodspeed
2013-06-28CHOP-959: Streamline processing for --graphicslevel switch.Nat Goodspeed
2013-06-28merge changes for 3.6.1-releaseOz Linden
2013-06-27Merged lindenlab/viewer-release into defaultCinder Roxley