summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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-07increment viewer version to 3.7.12Oz Linden
2014-07-02MAINT-4203 FIXED [Group Bans] Member list shows newly banned ex-residentsandreykproductengine
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-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-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-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-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-08Capitalize script colors floater for consistency.Cinder
2014-06-08Don't allow script colors floater resizeCinder
2014-06-08Update syntax color floater with recent changes.Cinder
2014-06-08Update sample script in script colors floaterCinder
2014-06-08"sections" is apparently unused as well.Cinder
2014-06-07Merge upstreamCinder
2014-06-05MergeRicky Curtice
2014-06-04A little more cleanup in LLSyntaxIDLSL and LLKeywordsCinder
2014-06-04STORM-2025: Part 2 - After consulting with Oz, remove subcategories of ↵Cinder
constants and fix highlighting
2014-06-04make "default" a constant, and remove that and "state" from eventsOz Linden
2014-06-02Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.Stinson Linden
2014-05-31MAINT-4114: Refactoring the LLBadge code to ensure a parent view always has ↵Stinson Linden
the badge (to preserve memory cleanliness), but to also allow for badge reparenting so that the NEW badge works in the inventory window. This change relates to 9e0d629da1487f850beb2767bd47734c4ccc393e.
2014-05-29MAINT-4106: Correcting crash on exit behavior during normal shutdown. With ↵Stinson Linden
the more comprehensive texture cleanup going on, this code was causing an crash on exit when gAgentAvatarp was null. Adding a check for null before proceeding.
2014-05-28Make default and state out of flow-control and into eventsCinder
2014-05-28Don't hardcode black as the default color for syntaxCinder
2014-05-28MAINT-4070 FIXED Use icon in urls when content is trusted.maxim@mnikolenko
2014-05-27MAINT-4009: Ensuring that the view listeners are properly cleaned up at app ↵Stinson Linden
close.
2014-05-19Pull merge from lindenlab/viewer-releaseMerov Linden
2014-05-20MAINT-4009: Ensuring that the cookie store is properly cleaned on app exit.Stinson Linden
2014-05-19mergeBrad Payne (Vir Linden)
2014-05-19mergeBrad Payne (Vir Linden)