summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-06-20Fixing some merge screwups someone in the last 10,000 comnitscallum_linden
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-20MAINT-3475 FIXED 'windows 64bit (?) crash in ↵maksymsproductengine
LLTextBase::getDocIndexFromLocalCoord'
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-20MAINT-1192 FIXED Empty folders remain in the recent items tab of inventory ↵Mnikolenko ProductEngine
until relog
2014-06-19Pulled fix for MAINT-3154Aura Linden
2014-06-19DD-83 : New listing folders immediately renamable on creationMerov 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-3967 FIXED Up arrow key does not move the cursor up in chat field.maksymsproductengine
2014-06-19MAINT-4157 FIXED Lag meter tool tips are missing unitsMnikolenko ProductEngine
2014-06-18Merge downstream codesimon
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-17Post-merge cleanup. In onCompleted() restore the unconditionalMonty Brandenberg
use of setGetStatus() in case the baked texture service changes introduced some sort of hidden (and wrong) dependency. Left out the ridiculous duplicated invocation inside that failure status block. Someone damaged texture console again and apparently didn't even bother to look at their work. I'm sure they documented their changes on the public wiki as well. Unified the logging tag throughout lltexturefetch.cpp. Only way to get the cut-n- pasters to do the right thing.
2014-06-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-06-17STORM-2034 Adjust comment block indentJonathan Yap
2014-06-16viewer-release mergeChris Baker
2014-06-16Merge. Refresh from viewer-release after 3.7.9 release.Monty Brandenberg
2014-06-16Merge with head of viewer-releaseCallum Prentice
2014-06-16correct merge mistakeOz Linden
2014-06-16MAINT-3634 FIXED After right-clicking another avatars nametag or avatar then ↵andreykproductengine
pressing the "Alt" key, most options in the dropdown menu will no longer function.
2014-06-17MAINT-1192 FIXED Don't show folder without recent item in it for "Recent" tab.Mnikolenko ProductEngine
2014-06-16merge changes for 3.7.9-releaseOz Linden
2014-06-16increment viewer version to 3.7.10Oz Linden
2014-06-13DD-82 : Update marketplace listings after delete, cut and other operations ↵Merov Linden
on selected items
2014-06-11DD-98 : Add message with link to marketplace if listing cannot be editedMerov Linden
2014-06-11DD-130 : Count all folders and subfolders from the version folder excluding ↵Merov Linden
the version folder itself
2014-06-11DD-126 : Ask for confirmation when moving a version folder in a way that ↵Merov Linden
will deactivate it
2014-06-11STORM-2034 Fix and improve processing when hours overflow to daysJonathan Yap
2014-06-11MAINT-4133 FIXED Import llpanelgroupinvite.cpp from viewer_lion to ↵maksymsproductengine
voorhees_groupban.
2014-06-10DD-107, DD-111 : Add a tooltip to indicate why you can't move an active listingMerov Linden
2014-06-10STORM-2034 Made small coding change per Oz's requestJonathan Yap
2014-06-10DD : Clean up marketplace listings folder creation so we create it in only ↵Merov Linden
one place
2014-06-10STORM-2034 Try to fix incorrect logic about increasing and decreasing filtering.Jonathan Yap
Minor XML adjustment.
2014-06-10MAINT-4135 FIXED Text input field is not disabled in group chat window for ↵andreykproductengine
user who cannot enter text chat
2014-06-11MAINT-4112 FIXED Disable moving objects composed of multiple items to My ↵Mnikolenko ProductEngine
outfits.
2014-06-10MAINT-4132 FIXED Don't call notification for debug messages from not owned ↵Mnikolenko ProductEngine
objects
2014-06-09DD-115, DD-130 : Fixed. Count items and folders from the version folder, not ↵Merov Linden
the listing root
2014-06-09DD-126 : Fixed. Check that the version folder depth is 2 when enforcing ↵Merov Linden
consistency rules
2014-06-09DD-97 : When clearing the version folder of a record, force activation ↵Merov Linden
(listed) status to false at the same time, avoiding confusing (and eventually wrong) double call to updateSLMListing
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-09DD-107, DD-111 : Fixed! Do not allow active listing and version folders to ↵Merov Linden
be moved or cut or deleted (must unlist first).