summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-02merge from viewer-trunkTofu Linden
2010-04-01Automated MergeRoxie Linden
2010-04-01Incorporate Aimees code review commentsRoxie Linden
2010-04-01MergeMatthew Breindel (Falcon)
2010-04-01DEV-47845: Finished fixing an update bug on the physics shape type and fixed ↵Matthew Breindel (Falcon)
the name of that combo box.
2010-04-01another fix for bad mergeRichard Linden
2010-04-01fix for bad mergeRichard Linden
2010-04-01added newline at eofRichard Linden
2010-04-01mergeDave Parks
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-02Low bug (EXT-6677) Crash when selecting empty outfit edit panelSergei Litovchuk
- Added NULL check for selected item pointer. Reviewed by Neal Orman https://codereview.productengine.com/secondlife/r/162/ --HG-- branch : product-engine
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-01fix bad xml; IT linguisticEli Linden
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
2010-04-01Automated mergeRoxie Linden
2010-04-01mergeTofu Linden
2010-04-01EXT-6680 : [INFRASTRUCTURE] Change LLInventoryPanel "LLFolderView* mFolders" ↵Loren Shih
to "LLFolderView* mRootFolder" Superficial member variable name changes.
2010-04-01Fixed line endingMatthew Breindel (Falcon)
2010-04-01MergeMatthew Breindel (Falcon)
2010-04-01DEV-47845 More cleanup. Fixed a bug where the physics shape type wouldn't ↵Matthew Breindel (Falcon)
get displayed properly until you re-selected an object.
2010-04-01EXT-4084 : Change LLInventoryBridge "LLFolderView* folder" to "LLFolderView ↵Loren Shih
*rootFolder" Superficial cleanup - changed all instances to "LLFolderView* root".
2010-04-01Fixed bug EXT-6337 (Changing maturity settings in preferences floater only ↵Vadim Savchuk
works on first floater spawn when account is not age verified). I'm actually copying an existing fix from the viewer-hotfix branch. See the ticket for more details. Not reviewed. --HG-- branch : product-engine
2010-04-01fix for EXT-6678: crash at LLTextureCache::openAndReadEntry [secondlife-bin ↵Xiaohong Bao
lltexturecache.cpp:1111]
2010-04-01merge from viewer-trunkTofu Linden
2010-04-01Checker: CHECKED_RETURNTofu Linden
Function: LLViewerMediaImpl::createMediaSource() File: /indra/newview/llviewermedia.cpp
2010-04-01make LLImageBase::allocateData() thread-safe.Xiaohong Bao
insert debug code for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]