summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-04-05MergeLeyla Farazha
2010-04-05automated mergeLoren Shih
2010-04-02EXT-5921 Inspector icon in nearby chat/IM doesn't match other inspector iconsLeyla Farazha
2010-04-02Updated Mac build of LLQtWebKit library.Monroe Linden
This was built from: revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch) revision f35a5eab8c2f in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'cookie-api' branch)
2010-04-02Merge with tipCallum Prentice
2010-04-02DEV-47911: Backport webkit security fixes 2010-03-23 (via new version of ↵Callum Prentice
LLQtWebKit/Windows)
2010-04-02EXT-6696 : Make Library inventory items somehow distinguishable at first ↵Loren Shih
glance from My Inventory items Library items are now set to Emphasis Color. This can be easily changed. Also fixed an issue where the "(Loading...)" string was overlapping with folder inventory strings.
2010-04-02EXT-5940 : INFRASTRUCTURE: Typedef all vector<LLUUID>'sLoren Shih
Fixed some more typedefs that I missed in first checkin.
2010-04-02automated mergeLoren Shih
2010-04-02automated mergeLoren Shih
2010-04-02mergeBrad Payne (Vir Linden)
2010-04-02mergeBrad Payne (Vir Linden)
2010-04-02Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkXiaohong Bao
2010-04-02add some debug code for EXT-5394: Crash in ↵Xiaohong Bao
LLViewerMediaImpl::calculateInterest()
2010-04-02automated mergeLoren Shih
2010-04-02EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanupLoren Shih
Moved a bunch of local llinventorybridge functions into .cpp. Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-04-02EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanupLoren Shih
Moved a bunch of local llinventorybridge functions into .cpp. Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-04-02CleanupBrad Payne (Vir Linden)
2010-04-02Automated mergeRoxie Linden
2010-04-02DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
Includes: DEV-45800, DEV-45803 - Grid Manager DEV-45804 - SLURL refactor DEV-45801 - Single username field (for Identity Evolution and SLE Ldap) Also, Includes Certificate Management code allowing the viewer to connect to grids not signed by a well know key (just like any web browser). Also contains secure storage for things like passwords. The security/certificate code is modular with the intention of adding modules to directly use the operating system facilities for crypto if available. (that's much more secure than we'll ever be) Also, refactor of voice to modularize it, and add a diamondware voice module. CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-01Automated MergeRoxie Linden
2010-04-01Incorporate Aimees code review commentsRoxie Linden
2010-04-01another fix for bad mergeRichard Linden
2010-04-01fix for bad mergeRichard Linden
2010-04-01added newline at eofRichard Linden
2010-04-01mergeRichard Linden
2010-04-01EXT-3531 - Ctrl-p doesn't work reliably on loginRichard Linden
moved gEditMenuHandler handling to LLEditMenuHandler destructor
2010-04-01mergeRichard Nelson
2010-04-01fixed line endingsLeyla Farazha
2010-04-01MergeLeyla Farazha
2010-04-01Cleanup and consolidationBrad Payne (Vir Linden)
2010-04-01EXT-3792 Legacy menus are still displayed in Inventory in Inventory side panelLeyla Farazha
reviewed by Richard CC#176
2010-04-01EXT-5110 Save Outfit dialog is non-standard modal dialog (off-center ↵Leyla Farazha
placement, empty titlebar) reviewed by Richard CC#176
2010-04-01EXT-5179 In Prefs->Setup, move Other Devices to bottom of window or to ↵Leyla Farazha
advanced EXT-5170 prefs review: move UI size to advanced reviewed by Richard CC#176
2010-04-01EXT-5168 prefs review: Remove "Small nametags" optionLeyla Farazha
reviewed by Richard cc#176
2010-04-01EXT-5584 color picker swatches are missing pure red and many common shadesLeyla Farazha
reviewed by Richard cc#176
2010-04-01EXT-6492 - button halign=center doesn't take into account left and right padRichard Linden
2010-04-01automated mergeLoren Shih
2010-04-01EXT-6679 : INFRASTRUCTURE : Have LLInvFVBridge contain a LLFolderView *mRoot ↵Loren Shih
instead of passing it along everywhere such as in performAction mRoot is now stored for all LLInventoryBridge types. Did some superficial formatting cleanup for LLInventoryBridge.
2010-04-01Cleanup and consolidationBrad Payne (Vir Linden)
2010-04-01EXT-3606 - Script editor window: next line not indenting if current line wrapsRichard Linden
2010-04-01Cleanup and consolidationBrad Payne (Vir Linden)
2010-04-01EXT-6307 World Map: field of view triangle rotatesRichard Linden
reviewed by Leyla
2010-04-01mergeRichard Nelson
2010-04-01removed unused texturesRichard Nelson
reviewed by Erica
2010-04-01EXT-6431 - Avatar head doesn't correctly follow mouse when side panel is openRichard Nelson
2010-04-01EXT-3531 - Ctrl-P does not work reliably on loginRichard Nelson
deprecated handle_edit_keys_directly and moved edit menu out of menu_viewer and menu_login
2010-04-01EXT-3531 - Ctrl-P does not work reliably on loginRichard Nelson
forgot menu_edit.xml
2010-04-01fixed buildRichard Linden
2010-04-01EXT-3531 - Ctrl-P does not work reliably on loginRichard Nelson
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-03 19:16:27 +0000