summaryrefslogtreecommitdiff
path: root/indra/newview/skins
AgeCommit message (Collapse)Author
2014-08-04Merge. Refresh from viewer-release after 3.7.13 release.Monty Brandenberg
2014-07-22viewer-release 3.7.13 mergemaksymsproductengine
2014-07-21merge changes for 3.7.12-releaseOz Linden
2014-07-14MAINT-4226 Group ban option is added to participant menu in Group chat.Mnikolenko ProductEngine
2014-07-10merge changes for 3.7.12-releasemaksymsproductengine
2014-07-08Merge. Refresh from viewer-release after 3.7.11 release.Monty Brandenberg
2014-07-07Merge viewer-release and become version 3.7.12simon
2014-07-07MAINT-2980 Back out most changes related to upping the 512MB texture cap to ↵Dave Parks
unblock RC.
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-24Merge viewer-release and become version 3.7.11simon
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-23Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseMonty Brandenberg
2014-06-23merge changes for 3.7.10-releaseOz 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-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-18MAINT-3186 FIXED Disable menu items if group or ad-hoc chat is in multiselectionmaxim@mnikolenko
2014-06-17MergeRichard Linden
2014-06-16viewer-release mergeChris Baker
2014-06-09STORM-2026 - Use more unique syntax colors by default, also clean up some ↵Cinder
indentation
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-04All: Update .png files with conformance problems as reported by pngfix.Monty Brandenberg
With the updated PNG library (1.6.8), we're getting stderr warnings about non-conformance issues with images in the build. These warnings include: * iCCP: known incorrect sRGB profile * iCCP: profile 'ICC Profile': 1000000h: invalid rendering intent * iCCP: cHRM chunk does not match sRGB These were normalized by running an ImageMagick 'convert -strip' pass over each PNG image. 'compare -metric AE' reports 0 delta for all before/after pairs.
2014-06-04STORM-2025: Part 2 - After consulting with Oz, remove subcategories of ↵Cinder
constants and fix highlighting
2014-05-19Pull merge from lindenlab/viewer-releaseMerov Linden
2014-05-16Trivial indentation change in floater_script_ed_prefs.xmlCinder
2014-05-16Typo fixCinder
2014-05-16Set colors for script editorCinder
2014-05-14Refactor more script editor properties away from LLTextEditor to LLScriptEditorCinder
2014-05-14Begin syntax coloring personalizationCinder
2014-05-13STORM-2028 - Show context menu in script editorCinder
2014-05-07Merge downstream version 3.7.8 codesimon
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile ↵Merov Linden
errors
2014-04-29MAINT-3975 FIX Group Invitation window omits ? button for listed residents ↵Richard Linden
(INTEREST LIST RC only)
2014-04-22Pull merge from lindenlab/viewer-releaseMerov 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-21Merge downstream codesimon
2014-04-21Merge downstream code updating version to 3.7.7simon
2014-04-18Move some more script editor functions from LLTextEditor to LLScriptEditorCinder
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-11MAINT-3698 Typo is fixedmaxim@mnikolenko