summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
AgeCommit message (Expand)Author
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 u...Dave Parks
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" de...Dave Parks
2014-06-23merge changes for 3.7.10-releaseOz Linden
2014-06-20STORM-2035 - Invert the background color in script editors for highlighting s...Cinder
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-04STORM-2025: Part 2 - After consulting with Oz, remove subcategories of consta...Cinder
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 er...Merov Linden
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
2014-04-11MAINT-3698 Typo is fixedmaxim@mnikolenko
2014-04-11MAINT-3698 Typo is fixedmaxim@mnikolenko
2014-04-08merge changes for 3.7.5-releaseOz Linden
2014-04-01Merge downstream codesimon
2014-03-31MAINT-535 FIXED The teleport SLAPP is changed to UNTRUSTED_THROTTLE. Confirma...Mnikolenko ProductEngine
2014-03-26Pull in downstream -bear, viewer-release and become version 3.7.5simon
2014-03-26Pull in viewer-release and become version 3.7.5simon
2014-03-24Pull merge from lindenlab/viewer-releaseMerov Linden
2014-03-24merge with releaseRichard Linden
2014-03-24merge changes for 3.7.4-releaseOz Linden
2014-03-18merge changes for STORM-2007Oz Linden
2014-03-18MAINT-1744 FIXED User cannot unblock an object by selecting "Unblock" menu it...Mnikolenko ProductEngine
2014-03-17ACME-1376 : Suppress location checkbox in Facebook Photo panelMerov Linden
2014-03-17ACME-1376 : Take the location checkbox out of the photo panelMerov Linden
2014-03-14merge changes for 3.7.3-releaseOz Linden
2014-03-17MAINT-2176 FIXED Maturity icon is addedMnikolenko ProductEngine
2014-03-14merge changes for storm-2007Oz Linden