summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-04-06more fixing from the viewer-trunk mergeTofu Linden
2010-04-06some fixing from the viewer-trunk merge.Tofu Linden
2010-04-06another hairy merge from viewer-trunk :(Tofu Linden
2010-04-02mergeTofu Linden
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-02ssreflection: restore the shadow factor I accidentally removed with the last ↵Tofu Linden
update.
2010-04-02apply ssreflection changes to class2 and class3 too.Tofu Linden
2010-04-02clean-up transplantTofu Linden
2010-04-02ssreflections: perspective reflection for sunlight, planar reflection for ↵Tofu Linden
ssreflection
2010-04-02ssreflections: water reflections strongly imply that the non-perspective ↵Tofu Linden
reflection from eye is the right one.
2010-04-02CleanupBrad Payne (Vir Linden)
2010-04-02ssreflections: use the minimum of the lighting dp and the appropriateness. ↵Tofu Linden
not the product.
2010-04-02ssreflections: reflect sunlight direction for reflection. dunno how I feel ↵Tofu Linden
about this yet.
2010-04-02merge fixTofu Linden
2010-04-02PE mergeTofu Linden
2010-04-02Fixed normal bug EXT-6357 (SLapp for object chat does display an inspector) ↵Eugene Mutavchi
- added new LLUrlEntry to support 'secondlife:///app/objectim/{UUID}/' SLapps. Fixed passing the SLURL to inspect_remote_object floater. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/158/ --HG-- branch : product-engine
2010-04-02Fixed normal bug EXT-5831(Do not apply font color to timestamps in chat ↵Eugene Mutavchi
history) - added new 'ChatTimestampColor' color setting, which is set to timestamps for chat history messages in text mode which are not from log. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/160/. --HG-- branch : product-engine
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-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