summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2014-05-19Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Stinson Linden
2014-05-19increment viewer version to 3.7.9Oz Linden
2014-05-19merge fix for merge with project interesting. New appearance utility source ↵Nyx Linden
and one quick doubly-declared typedef.
2014-05-16DD-102 : Fix crash when emptying trash containing nested folders. Also avoid ↵Merov Linden
getting listings several times
2014-05-16MAINT-4009: First pass refactoring to eliminate memory related to error ↵Stinson Linden
reporting that is not properly cleaned up.
2014-05-16merge fixBrad Payne (Vir Linden)
2014-05-16Update syntax coloring in the preview script on the fly.Cinder
2014-05-16Trivial indentation change in floater_script_ed_prefs.xmlCinder
2014-05-16Typo fixCinder
2014-05-16merge fixesBrad Payne (Vir Linden)
2014-05-16Set colors for script editorCinder
2014-05-16Merge upstreamCinder
2014-05-15fix for bad mergeBrad Payne (Vir Linden)
2014-05-14Color syntax in script colors floaterCinder
2014-05-14Clean up LLSyntaxIdLSL ctorCinder
2014-05-14DD-76, DD-77, DD-90 : recycled can_move_to_outbox() into ↵Merov Linden
can_move_to_marketplace() so we have now the same logic for both marketplace and merchant outbox
2014-05-14v-r -> s-e merge WIPBrad Payne (Vir Linden)
2014-05-14clean up the constructor for LLSyntaxIdLSLOz Linden
2014-05-14Refactor more script editor properties away from LLTextEditor to LLScriptEditorCinder
2014-05-14Pull merge from lindenlab/viewer-directdeliveryMerov Linden
2014-05-14DD-95 : Prevent validation to run on folders that are not under the ↵Merov Linden
marketplace root
2014-05-14Begin syntax coloring personalizationCinder
2014-05-13STORM-68 Apply default upload permission settings for ONLY Share with Group andJonathan Yap
Allow anyone to Copy to snapshot upload. The Next owner values will stay at full perms.
2014-05-13DD-89 : Separate warnings from infos in the SLM API log. Infos are controled ↵Merov Linden
by a setting. Warning are always logged.
2014-05-13STORM-2028 - Show context menu in script editorCinder
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-12DD-89 : Add a MarketplaceListingsLogging setting to get SLM API logs. DD-22 ↵Merov Linden
: Fixed the delete /listing route
2014-05-12DD-22 : WIP : Implement the GET /listing/:listing route to complete the SLM ↵Merov Linden
API coverage. Will be used only in test.
2014-05-12Style - rename previously static members, fix scope, ease up on the ↵Cinder
exclamation points in debug messages
2014-05-12Eliminate updateKeywords()Cinder
2014-05-12STORM-2027 - Fix syntax highlighting on subsequent opening of scripts.Cinder
This could use more refactoring, but it fixes it.
2014-05-11Fix callback signal, Eliminate some unnecessary staticsCinder
2014-05-09DD-22 : WIP : Implement deleteSLMListing() to cover the Delete ↵Merov Linden
/listing/:listing_id route. Avoid recursive calls in deleteListing()
2014-05-09MAINT-4009: Improved patching of a memory leak for when menu items are ↵Stinson Linden
created before the viewer window initialization has created the menu holder. See also changeset bc0743639926a84b38b4907d252eff1cc0498c7d.
2014-05-09Merge downstream codesimon
2014-05-08DD-22 : WIP : More clean up of marketplace classes, rationalize methods namingMerov Linden
2014-05-09MAINT-3981 FIXED [SECURITY] Notecard being passed around that crashes any V3 ↵AndreyL ProductEngine
based viewer when opened. Correct fix after testing.
2014-05-08DD-22 : WIP : Cleanep up the class definition, seting methods private and ↵Merov Linden
better isolate calls leading to HTTP requests
2014-05-07Merge up.Cinder
2014-05-07Code policyCinder
2014-05-07DD-22 : WIP : Completed the associate_listing route, take edit_url into ↵Merov Linden
account and rewrite getListingURL()
2014-05-07DD-22 : WIP : Partial implementation of PUT associate_listingMerov Linden
2014-05-07Merge downstream version 3.7.8 codesimon
2014-05-07correct bad merges from 3.7.7-releaseOz Linden
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-05-07Fix Windows build issues: change in onVisibility() profile needed to ↵Merov Linden
percolate to SL Share panels
2014-05-06DD-22 : WIP : Implement the modify listing route. Made the code more ↵Merov Linden
readable and cleared old debug code
2014-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile ↵Merov Linden
errors
2014-05-06increment viewer version to 3.7.8Oz Linden