summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-12-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-12-09blindly fix-up llmediaplugintest.cpp with respect to the recent API change.Tofu Linden
2009-12-09merge!Tofu Linden
2009-12-09Fix for EXT-2703 & EXT-2708 - save texture as issuesEric M. Tulla (BigPapi)
Added save as to texture preview floater. Fixed behavior of save as (was only working for textures, not snapshots). Removed advanced menu entry for save texture as (refused to work after multiple implementations).
2009-12-09MergeJames Cook
2009-12-09remove LL_PATH_BROWSER_PROFILETofu Linden
it really has no point now - it's not used by the viewer, and the webkit plugin's private space should be opaque to the viewer.
2009-12-09Fix line endings.James Cook
2009-12-09MergeJames Cook
2010-12-08mergeLeyla Farazha
2010-12-08adding notes about visible / enable callback registries being mergedLeyla Farazha
2010-12-08EXT-2807 Update mini-inspector to include Group Voice Chat moderator controlsLeyla Farazha
reviewed by Richard
2010-12-07mergeLeyla Farazha
2010-12-07EXT-3265 Gear menu on_visible params are broken - not setting visibility of ↵Leyla Farazha
menu items EXT-2923 [BSI] My own inspector lists "Stand Up" as an option in gear menu, while I'm standing
2009-12-09EXT-2827 and fix for delete key not deleting objects while building.James Cook
Object inventory was grabbing edit menu handling during refresh. Put back Angela's code so that Right-click > Remove > Delete is now disabled if you have a single face selected. Fixed LLSelectMgr::contains() for SELECT_ALL_TES case. Reviewed with Richard.
2009-12-09EXT-2980 Remove indentation on back button history list.James Cook
Design reviewed with Lis
2009-12-09DEV-43948 viewer2 is writing session data into the 'read-only' installation ↵Tofu Linden
tree (mostly media stuff) propagate the parent app's OSUserAppDir (i.e. ~/.secondlife/) all the way down to plugins, if they need persistant user data/settings (like the webkit plugin needs a place to put its cache).
2009-12-09automated mergeLoren Shih
2009-12-09automated merge viewer2.0->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-09EXT-3274 : Landmarks or Favorites accordion panel shows up as emptyLoren Shih
EXT-1609 : Strange behavior for accordions in Places panel, Landmarks tab Forcing top-level folders open when accordion is active. Removed logic that was saving and restoring initial folder state. --HG-- branch : avatar-pipeline
2009-12-09rename LL_PATH_MOZILLA_PROFILE to LL_PATH_BROWSER_PROFILETofu Linden
2009-12-09Automated merge with ssh://hg.lindenlab.com/james/gooeyErica
2009-12-09merge - bad line endingsErica
2009-12-09ext-2981 button and text editor height schould be 23px, not 16pxLis Pardi
2009-12-09MergeJames Cook
2009-12-09fix for linux build breakage, a LLPointer was being implicitly cast wrongNyx (Neal Orman)
approved by Seraph --HG-- branch : avatar-pipeline
2009-12-09EXT-2980 make back button in nav bar match specLis Pardi
2009-12-09Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/Nyx (Neal Orman)
--HG-- branch : avatar-pipeline
2009-12-09EXT-2819 crash in color picker in appearance editorNyx (Neal Orman)
Made progress by writing code to match the style we use for the texture picker. It now should not make a difference if you destroy the color picker floater or the color swatch control first - either direction it should do sufficient cleanup and protection. However, still getting this crash. Will investigate further later. Code reviewed by Seraph --HG-- branch : avatar-pipeline
2009-12-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-12-09Reduce likelihood of indefinite wait in viewer integration tests.Nat Goodspeed
Introduce LLStartupListener to allow viewerclient-based test script to query startup state. This handles the scenario in which, by the time the test script manages to connect, the viewer already IS in STATE_STARTED. Fix ViewerSession to invoke that query before waiting for STATE_STARTED. Make that wait time out eventually to deal with "System currently logging you off, please wait 5 minutes." Timeout raises new ViewerWontLogin exception. Fix testlangs to catch ViewerWontLogin and retry a limited number of times.
2009-12-09Accordions in appearance panel don't use full space, removed borders in ↵Erica
inventory panel, standardized button sizes, changed login according to feedback
2009-12-08mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-08mergerichard
2009-12-08EXT-2572 - Bottom text on bottom line in nearby chat is clippedrichard
2009-12-08EXT-2702 the Group abilities 'Show in Find Places' is mislabeled.Ramzi Linden
Also updated various places that refer to the 1.23 style UI.
2009-12-08MergeJames Cook
2009-12-08MergeMark Palange (Mani)
2009-12-08EXT-3158 - Removing logging of users password hash from new login code.Mark Palange (Mani)
Reviewed by Brad
2009-12-08Merge backoutJames Cook
2009-12-08Back out EXT-2827 Unable to delete object when select face of objectJames Cook
May cause right-click delete to fail - testing that Backed out changeset: 1f8e1e73f9f4
2009-12-08Merge with Lis and Leyla' stuffJames Cook
2009-12-08EXT-3118 disabled Alerts appear to be enabled in PreferencesJames Cook
Wasn't rebuilding the list of alerts on Preferences open Cleaned up some formatting in llfloaterpreference.cpp
2009-12-08EXT-2980 Made location history menu items XML-configurableJames Cook
Reviewed with Leyla
2009-12-08EXT-3256 : Show help message in Favorites bar if emptyLoren Shih
--HG-- branch : avatar-pipeline
2009-12-08Automated merge with ssh://lis@hg.lindenlab.com/james/gooeyLis Pardi
2009-12-08EXT-3192 Preferences > Sounds UI issuesLis Pardi
2009-12-08automated merge viewer2.0->avpLoren Shih
--HG-- branch : avatar-pipeline
2009-12-08mergerichard
2009-12-08added fading back to icons in text widgetsrichard
2009-12-08EXT-3133: Viewer crashes after deleting a Trash folder from the My Inventory ↵Loren Shih
accordion Put in a quick fix so that folders can't be made reparented to their own children. --HG-- branch : avatar-pipeline