summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2014-08-21MAINT-4158 WIP - fix for bug caused by multiple wearables with the same asset idBrad Payne (Vir Linden)
2014-08-15more joint info in ArchetypeXML dump fileBrad Payne (Vir Linden)
2014-08-15MAINT-4158 WIP - fix for at least some forms of distortion. I can't repro ↵Brad Payne (Vir Linden)
the drastic height changes, so not positive it addresses that.
2014-08-04increment viewer version to 3.7.14Oz Linden
2014-07-22viewer-release 3.7.13 mergemaksymsproductengine
2014-07-21increment viewer version to 3.7.13Oz Linden
2014-07-17MAINT-4241 FIXED [Group Bans] Ban member(s) button is not greyed out for ↵andreykproductengine
banning group owners. Viewer gives message that you ejected group owner.
2014-07-16MAINT-4263 FIXED Viewer crashes after right click on group in Conversations.maksymsproductengine
2014-07-14MAINT-4226 Group ban option is added to participant menu in Group chat.Mnikolenko ProductEngine
2014-07-12fixing merge confictsmaksymsproductengine
2014-07-10merge changes for 3.7.12-releasemaksymsproductengine
2014-07-09mergeBrad Payne (Vir Linden)
2014-07-09MAINT-4216 FIXBrad Payne (Vir Linden)
2014-07-07Merge viewer-release and become version 3.7.12simon
2014-07-07increment viewer version to 3.7.12Oz Linden
2014-07-07MAINT-2980 Back out most changes related to upping the 512MB texture cap to ↵Dave Parks
unblock RC.
2014-07-02MAINT-4203 FIXED [Group Bans] Member list shows newly banned ex-residentsandreykproductengine
2014-06-30MAINT-2980 Fix for mac cutting texture memory in half (now that we're ↵Dave Parks
cutting texture memory to default to 1/3rd of installed ram, pre-cutting is redundant).
2014-06-25MAINT-4178 FIXED [Group Bans] The viewer allows you to attempt to ban when ↵andreykproductengine
the ban list already contains 500 entries, which fails.
2014-06-24STORM-2035 - Looking for a good selection box contrastCinder
2014-06-24Merge viewer-release and become version 3.7.11simon
2014-06-23Automated merge with https://bitbucket.org/lindenlab/viewer-tigerDave Parks
2014-06-23MAINT-2980 Up texture memory slider cap to 4096MB. Make "Texture Memory" ↵Dave Parks
default to 1/3rd of video memory. Add description on debug setting and tooltip to explain why.
2014-06-23merge changes for 3.7.10-releaseOz Linden
2014-06-23increment viewer version to 3.7.11Oz Linden
2014-06-23MAINT-4175 FIXED [Group Bans] When banning a list of multiple avatars, if an ↵andreykproductengine
already banned avatar is included in the list, no avatars are added to the ban list and those avatars already group members are not ejected from the group.
2014-06-23viewer-release mergeChris Baker
2014-06-23MAINT-4182 Cleaning upandreykproductengine
2014-06-20STORM-2035 - Invert the background color in script editors for highlighting ↵Cinder
sections. Since the background color can be changed by the user, this ensures distinctive highlighting
2014-06-20STORM-2036 - Fix trying to parse caps too early by adding a callback to ↵Cinder
check region caps when they haven't already been received
2014-06-20BUG-6425 - Init default keywords file during ctor so we have something to ↵Cinder
fallback on should caps or fetch fail
2014-06-19Pulled fix for MAINT-3154Aura Linden
2014-06-19MAINT-4182 FIXED The group ban list always appears emptyandreykproductengine
2014-06-19MAINT-4174 FIXED "Ban Resident(s)" button in Banned residents tab is active ↵andreykproductengine
for members without ban permissions, after viewing 'Banned Residents' tab in a group where they do have ban permissions
2014-06-18Pulled merge from release.Aura Linden
2014-06-18MAINT-3186 FIXED Disable menu items if group or ad-hoc chat is in multiselectionmaxim@mnikolenko
2014-06-17Retropedaling on SH-4030 fix that crashes my viewer on logginMerov Linden
2014-06-17DRTVWR-354 : Rewrite Responders for Twitter and Flickr to conform to new ↵Merov Linden
LLHTTPClient interface. Fix merge error in Facebook connect as well
2014-06-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-06-17Merge viewer-release and become version 3.7.9simon
2014-06-17MergeRichard Linden
2014-06-16viewer-release mergeChris Baker
2014-06-16correct merge mistakeOz Linden
2014-06-16merge changes for 3.7.9-releaseOz Linden
2014-06-16increment viewer version to 3.7.10Oz Linden
2014-06-11MAINT-4133 FIXED Import llpanelgroupinvite.cpp from viewer_lion to ↵maksymsproductengine
voorhees_groupban.
2014-06-09STORM-2026 - Use more unique syntax colors by default, also clean up some ↵Cinder
indentation
2014-06-09Greatly simplify LLSyntaxIdLSL:Cinder
* Move file fetched callback to the singleton and handle all syntax id changes within the singleton * Remove a fair number of bool checks and method relying more on callbacks to drive syntax changes. * Don't pretty print the cache file to conserve space and to speed up xml to llsd parsing * Clean up includes
2014-06-09MAINT-4001 : Pull merge in viewer-tiger for quick releaseMerov Linden
2014-06-09Fix for maint-3154 alt-zoom zooms way outAura Linden